summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugeni Dodonov <eugeni.dodonov@intel.com>2012-04-13 17:08:48 -0300
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-04-17 12:13:46 +0200
commit0cd83aa9a6aba8fec7d94d4fd5302172e14cebf7 (patch)
tree37d52eadbc1c48a38d365ef9a147b6f5ecf79314
parentc51ed787f6c49de7c2180c0f78e1d0e1360c7e86 (diff)
downloadop-kernel-dev-0cd83aa9a6aba8fec7d94d4fd5302172e14cebf7.zip
op-kernel-dev-0cd83aa9a6aba8fec7d94d4fd5302172e14cebf7.tar.gz
drm/i915: share IVB cursor routine with Haswell
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-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 0ef4472..c67eb77 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6770,7 +6770,7 @@ static void intel_crtc_update_cursor(struct drm_crtc *crtc,
if (!visible && !intel_crtc->cursor_visible)
return;
- if (IS_IVYBRIDGE(dev)) {
+ if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev)) {
I915_WRITE(CURPOS_IVB(pipe), pos);
ivb_update_cursor(crtc, base);
} else {
OpenPOWER on IntegriCloud