diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-02-17 11:13:17 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-02-17 11:13:17 +1000 |
| commit | 18a0de8816766a0da7537ef82156b5418ba5cd6e (patch) | |
| tree | faec026fbfa4a45ec0d7748a78b132f43525a8c5 | |
| parent | b7a26998590c5efb371562fb8a84bc93094009f5 (diff) | |
| parent | d74c67dd7800fc7aae381f272875c337f268806c (diff) | |
Merge branch 'drm-fixes-4.10' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
One regression fix for interlaced modes on radeon
* 'drm-fixes-4.10' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon: Use mode h/vdisplay fields to hide out of bounds HW cursor
| -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 fb16070b266e..4a4f9533c53b 100644 --- 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; |