[1/2] Revert "drm/i915: Workaround CHV pipe C cursor fail"

Commit Message

Akshu Agrawal June 8, 2016, 8:27 a.m. UTC

This reverts commit ef8dd37af85a8f37ca3a29074647511e52c56181.

Will use cropped cursor image for -ve co-ordinates instead of using
swcursor. Advantages of cropped cursor being, it will work for non X11
based platform like Chrome and also will use hwcursor.

Signed-off-by: Akshu Agrawal <[e-mail]>
---
 drivers/gpu/drm/i915/intel_display.c | 17 -----------------
 1 file changed, 17 deletions(-)

Patch

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 12ff795..bca9245 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -14287,7 +14287,6 @@  intel_check_cursor_plane(struct drm_plane *plane,
 	struct drm_crtc *crtc = crtc_state->base.crtc;
 	struct drm_framebuffer *fb = state->base.fb;
 	struct drm_i915_gem_object *obj = intel_fb_obj(fb);
-	enum pipe pipe = to_intel_plane(plane)->pipe;
 	unsigned stride;
 	int ret;
 
@@ -14321,22 +14320,6 @@  intel_check_cursor_plane(struct drm_plane *plane,
 		return -EINVAL;
 	}
 
-	/*
-	 * There's something wrong with the cursor on CHV pipe C.
-	 * If it straddles the left edge of the screen then
-	 * moving it away from the edge or disabling it often
-	 * results in a pipe underrun, and often that can lead to
-	 * dead pipe (constant underrun reported, and it scans
-	 * out just a solid color). To recover from that, the
-	 * display power well must be turned off and on again.
-	 * Refuse the put the cursor into that compromised position.
-	 */
-	if (IS_CHERRYVIEW(plane->dev) && pipe == PIPE_C &&
-	    state->visible && state->base.crtc_x < 0) {
-		DRM_DEBUG_KMS("CHV cursor C not allowed to straddle the left screen edge\n");
-		return -EINVAL;
-	}
-
 	return 0;
 }