drm/i915: Use the correct scanout alignment for fbcon.
authorChris Wilson <chris@chris-wilson.co.uk>
Fri, 23 Jul 2010 22:32:05 +0000 (23:32 +0100)
committerEric Anholt <eric@anholt.net>
Mon, 26 Jul 2010 18:27:05 +0000 (11:27 -0700)
commit127bd2ac91c3ecf42890ac320f4c65346d110e78
treebbf5a83f5595cb5e1b420c5330ef4c35fe101e6b
parent9934c132989d5c488d2e15188220ce240960ce96
drm/i915: Use the correct scanout alignment for fbcon.

This fixes a potential modesetting error during boot with plymouth on
Broadwater and Crestline introduced with 9df47c. The framebuffer was
hard-coding an alignment of 64K, but the modesetting code required the
documented alignment of 128K. The result was that we would attempt to
unbind the pinned fbcon buffer, triggering an ERROR and ultimately
failing the mode change.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Eric Anholt <eric@anholt.net>
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_fb.c