| Message ID | 20160923130649.17828-1-tiwai@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
diff --git a/drivers/gpu/drm/radeon/radeon_cursor.c b/drivers/gpu/drm/radeon/radeon_cursor.c index 2a10e24b34b1..4e436eb49a56 100644 --- a/drivers/gpu/drm/radeon/radeon_cursor.c +++ b/drivers/gpu/drm/radeon/radeon_cursor.c @@ -193,10 +193,8 @@ static int radeon_cursor_move_locked(struct drm_crtc *crtc, int x, int y) if (w <= 0) { w = 1; cursor_end = x - xorigin + w; - if (!(cursor_end & 0x7f)) { + if (x > 0 && !(cursor_end & 0x7f)) x--; - WARN_ON_ONCE(x < 0); - } } } }
radeon_cursor_move_unlock() contains a workaround for AVIVO chips that are older than DCE6 when the cursor ends on 128 pixel boundary. It decreases the position when the calculated end position is on 128 pixel boundary. However, it hits also the condition where x=-1 and width=1 are passed, since cursor_end is 0 (which is aligned with 128, too). Then the value gets decreased and it hits WARN_ON_ONCE() below, eventually screws up the GPU. The fix is simply to skip the workaround when x is already zero. Also, remove the superfluous WARN_ON_ON() for the negative value check that wouldn't happen any longer after this change. Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=1000433 Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de> --- drivers/gpu/drm/radeon/radeon_cursor.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)