---

yaml --- r: 307172 b: refs/heads/master c: 0cd83aa h: refs/heads/master v: v3
git-mirror · Apr 17, 2012 · 7873f22 · 7873f22
1 parent b7eedc1
commit 7873f22
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c51ed787f6c49de7c2180c0f78e1d0e1360c7e86
+refs/heads/master: 0cd83aa9a6aba8fec7d94d4fd5302172e14cebf7
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/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 {