drm/radeon: Use mode h/vdisplay fields to hide out of bounds HW cursor

Michel Dänzer · alexdeucher · commit d74c67dd7800 · 2017-02-16T11:03:03.000-05:00
The crtc_h/vdisplay fields may not match the CRTC viewport dimensions with special modes such as interlaced ones. Fixes the HW cursor disappearing in the bottom half of the screen with interlaced modes. Fixes: 6b16cf7 ("drm/radeon: Hide the HW cursor while it's out of bounds") Cc: stable@vger.kernel.org Reported-by: Ashutosh Kumar <ashutosh.kumar@amd.com> Tested-by: Sonny Jiang <sonny.jiang@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
diff --git a/drivers/gpu/drm/radeon/radeon_cursor.c b/drivers/gpu/drm/radeon/radeon_cursor.c
@@ -205,8 +205,8 @@ static int radeon_cursor_move_locked(struct drm_crtc *crtc, int x, int y)
 	}
 
 	if (x <= (crtc->x - w) || y <= (crtc->y - radeon_crtc->cursor_height) ||
-	    x >= (crtc->x + crtc->mode.crtc_hdisplay) ||
-	    y >= (crtc->y + crtc->mode.crtc_vdisplay))
+	    x >= (crtc->x + crtc->mode.hdisplay) ||
+	    y >= (crtc->y + crtc->mode.vdisplay))
 		goto out_of_bounds;
 
 	x += xorigin;

Original file line number	Diff line number	Diff line change
`@@ -205,8 +205,8 @@ static int radeon_cursor_move_locked(struct drm_crtc *crtc, int x, int y)`
`205`	`205`	`}`
`206`	`206`
`207`	`207`	`if (x <= (crtc->x - w) \|\| y <= (crtc->y - radeon_crtc->cursor_height) \|\|`
`208`		`- x >= (crtc->x + crtc->mode.crtc_hdisplay) \|\|`
`209`		`- y >= (crtc->y + crtc->mode.crtc_vdisplay))`
	`208`	`+ x >= (crtc->x + crtc->mode.hdisplay) \|\|`
	`209`	`+ y >= (crtc->y + crtc->mode.vdisplay))`
`210`	`210`	`goto out_of_bounds;`
`211`	`211`
`212`	`212`	`x += xorigin;`