drm/i915: Fix fbcon setup to align display pitch to 64b.

This is required by the display plane, and fixes 1400x1050 laptop displays.

Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c
index a89ebea7b76d57e92285128b1950df949b2ca52d..bbf3e7f54f1eaee10c497dc3fa0c8160e5cd2bf3 100644 (file)
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
@@ -447,7 +447,7 @@ int intelfb_create(struct drm_device *dev, uint32_t fb_width,
        mode_cmd.height = surface_height;
 
        mode_cmd.bpp = 32;
-       mode_cmd.pitch = mode_cmd.width * ((mode_cmd.bpp + 1) / 8);
+       mode_cmd.pitch = ALIGN(mode_cmd.width * ((mode_cmd.bpp + 1) / 8), 64);
        mode_cmd.depth = 24;
 
        size = mode_cmd.pitch * mode_cmd.height;