summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Bumiller <e0425955@student.tuwien.ac.at>2012-07-26 20:53:19 +0200
committerBen Skeggs <bskeggs@redhat.com>2012-08-14 09:36:24 +1000
commitaf5e7d84b0ec45b2b614b0d6e3657cbdceaa21f9 (patch)
treed6e8986e4f5c455ab4bfe433ad293b894b7fe488
parente2b34fa0466500de7814fc4e492689cee5ac120b (diff)
downloadlinux-3.10-af5e7d84b0ec45b2b614b0d6e3657cbdceaa21f9.tar.gz
linux-3.10-af5e7d84b0ec45b2b614b0d6e3657cbdceaa21f9.tar.bz2
linux-3.10-af5e7d84b0ec45b2b614b0d6e3657cbdceaa21f9.zip
drm/nvd0/disp: mask off high 16 bit of negative cursor x-coordinate
Signed-off-by: Christoph Bumiller <e0425955@student.tuwien.ac.at> Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Cc: stable@vger.kernel.org
-rw-r--r--drivers/gpu/drm/nouveau/nvd0_display.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvd0_display.c b/drivers/gpu/drm/nouveau/nvd0_display.c
index d0d60e1e7f9..dac525b2994 100644
--- a/drivers/gpu/drm/nouveau/nvd0_display.c
+++ b/drivers/gpu/drm/nouveau/nvd0_display.c
@@ -790,7 +790,7 @@ nvd0_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)
struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
int ch = EVO_CURS(nv_crtc->index);
- evo_piow(crtc->dev, ch, 0x0084, (y << 16) | x);
+ evo_piow(crtc->dev, ch, 0x0084, (y << 16) | (x & 0xffff));
evo_piow(crtc->dev, ch, 0x0080, 0x00000000);
return 0;
}