aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-07-23 18:32:05 -0400
committerEric Anholt <eric@anholt.net>2010-07-26 14:27:05 -0400
commit127bd2ac91c3ecf42890ac320f4c65346d110e78 (patch)
treebbf5a83f5595cb5e1b420c5330ef4c35fe101e6b /drivers/gpu/drm/i915/intel_display.c
parent9934c132989d5c488d2e15188220ce240960ce96 (diff)
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>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 6d5477c5df04..a37d4cea98a6 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1255,7 +1255,7 @@ out_disable:
1255 } 1255 }
1256} 1256}
1257 1257
1258static int 1258int
1259intel_pin_and_fence_fb_obj(struct drm_device *dev, struct drm_gem_object *obj) 1259intel_pin_and_fence_fb_obj(struct drm_device *dev, struct drm_gem_object *obj)
1260{ 1260{
1261 struct drm_i915_gem_object *obj_priv = to_intel_bo(obj); 1261 struct drm_i915_gem_object *obj_priv = to_intel_bo(obj);