diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-07-23 22:32:05 (GMT) |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-07-26 18:27:05 (GMT) |
| commit | 127bd2ac91c3ecf42890ac320f4c65346d110e78 (patch) | |
| tree | bbf5a83f5595cb5e1b420c5330ef4c35fe101e6b /drivers/gpu/drm/i915/intel_drv.h | |
| parent | 9934c132989d5c488d2e15188220ce240960ce96 (diff) | |
| download | linux-127bd2ac91c3ecf42890ac320f4c65346d110e78.tar.xz | |
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_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 72206f3..2f7970b 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -215,6 +215,9 @@ extern void intel_init_clock_gating(struct drm_device *dev); extern void ironlake_enable_drps(struct drm_device *dev); extern void ironlake_disable_drps(struct drm_device *dev); +extern int intel_pin_and_fence_fb_obj(struct drm_device *dev, + struct drm_gem_object *obj); + extern int intel_framebuffer_init(struct drm_device *dev, struct intel_framebuffer *ifb, struct drm_mode_fb_cmd *mode_cmd, |