From: Takashi Iwai <tiwai@suse.de>
To: Alex Deucher <alexander.deucher@amd.com>
Cc: christian.koenig@amd.com, dri-devel@lists.freedesktop.org
Subject: [PATCH] drm/radeon: Fix negative cursor position
Date: Fri, 23 Sep 2016 15:06:49 +0200 [thread overview]
Message-ID: <20160923130649.17828-1-tiwai@suse.de> (raw)
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(-)
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);
- }
}
}
}
--
2.10.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next reply other threads:[~2016-09-23 13:06 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-23 13:06 Takashi Iwai [this message]
2016-09-26 8:57 ` [PATCH] drm/radeon: Fix negative cursor position Michel Dänzer
2016-09-26 9:42 ` Takashi Iwai
2016-09-26 12:09 ` Takashi Iwai
2016-10-27 9:02 ` Michel Dänzer
2016-10-27 9:39 ` Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160923130649.17828-1-tiwai@suse.de \
--to=tiwai@suse.de \
--cc=alexander.deucher@amd.com \
--cc=christian.koenig@amd.com \
--cc=dri-devel@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox