diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-11-15 10:02:39 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-11-15 10:02:39 +0100 |
| commit | c09cd6e9691ec6fce8cb90b65929cad389d39c84 (patch) | |
| tree | d76104420f72172b21b8fb5ca512baa016ac892b /drivers/gpu/drm/qxl/qxl_fb.c | |
| parent | 7eb1c496f7ac0f386552c0cd9144f6965fc61da5 (diff) | |
| parent | 96ab4c70396e4e5a4d623bc95e86484682bef78f (diff) | |
Merge branch 'backlight-rework' into drm-intel-next-queued
Pull in Jani's backlight rework branch. This was merged through a
separate branch to be able to sort out the Broadwell conflicts
properly before pulling it into the main development branch.
Conflicts:
drivers/gpu/drm/i915/intel_display.c
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/qxl/qxl_fb.c')
| -rw-r--r-- | drivers/gpu/drm/qxl/qxl_fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_fb.c b/drivers/gpu/drm/qxl/qxl_fb.c index 88722f23343..f437b30ce68 100644 --- a/drivers/gpu/drm/qxl/qxl_fb.c +++ b/drivers/gpu/drm/qxl/qxl_fb.c @@ -108,7 +108,7 @@ static void qxl_fb_dirty_flush(struct fb_info *info) u32 x1, x2, y1, y2; /* TODO: hard coding 32 bpp */ - int stride = qfbdev->qfb.base.pitches[0] * 4; + int stride = qfbdev->qfb.base.pitches[0]; x1 = qfbdev->dirty.x1; x2 = qfbdev->dirty.x2; |