diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2017-02-15 11:28:45 +0900 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2017-03-06 17:31:14 -0500 |
| commit | 64c46de968deccbb7a9bbd42c93f0399aea1036c (patch) | |
| tree | 306d9dc86aa42cf47543b3d24312ba0c54125054 | |
| parent | 55f14c685b8d5ca0e5954ecdc6101c3fef8365c1 (diff) | |
drm/radeon: Use mode h/vdisplay fields to hide out of bounds HW cursor
[ Upstream commit d74c67dd7800fc7aae381f272875c337f268806c ]
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: 6b16cf7785a4 ("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>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_cursor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_cursor.c b/drivers/gpu/drm/radeon/radeon_cursor.c index cba23008eca4..57f0082edb5f 100644 --- a/drivers/gpu/drm/radeon/radeon_cursor.c +++ b/drivers/gpu/drm/radeon/radeon_cursor.c @@ -186,8 +186,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; |