| Date | Sun, 09 Sep 2012 23:42:17 +0100 | From | Ben Hutchings <> | Subject | [ 27/95] drm/nvd0/disp: mask off high 16 bit of negative cursor x-coordinate |
| |
3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Bumiller <e0425955@student.tuwien.ac.at>
commit af5e7d84b0ec45b2b614b0d6e3657cbdceaa21f9 upstream.
Signed-off-by: Christoph Bumiller <e0425955@student.tuwien.ac.at> Signed-off-by: Ben Skeggs <bskeggs@redhat.com> [bwh: Backported to 3.2: register value is in the local 'data' variable] Signed-off-by: Ben Hutchings <ben@decadent.org.uk> --- drivers/gpu/drm/nouveau/nvd0_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/gpu/drm/nouveau/nvd0_display.c +++ b/drivers/gpu/drm/nouveau/nvd0_display.c @@ -472,7 +472,7 @@ static int nvd0_crtc_cursor_move(struct drm_crtc *crtc, int x, int y) { struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc); - const u32 data = (y << 16) | x; + const u32 data = (y << 16) | (x & 0xffff); nv_wr32(crtc->dev, 0x64d084 + (nv_crtc->index * 0x1000), data); nv_wr32(crtc->dev, 0x64d080 + (nv_crtc->index * 0x1000), 0x00000000);
|