Commit 18a0de88 authored by Dave Airlie's avatar Dave Airlie

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
parents b7a26998 d74c67dd
...@@ -205,8 +205,8 @@ static int radeon_cursor_move_locked(struct drm_crtc *crtc, int x, int y) ...@@ -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) || if (x <= (crtc->x - w) || y <= (crtc->y - radeon_crtc->cursor_height) ||
x >= (crtc->x + crtc->mode.crtc_hdisplay) || x >= (crtc->x + crtc->mode.hdisplay) ||
y >= (crtc->y + crtc->mode.crtc_vdisplay)) y >= (crtc->y + crtc->mode.vdisplay))
goto out_of_bounds; goto out_of_bounds;
x += xorigin; x += xorigin;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment