]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
drm/nvd0/disp: mask off high 16 bit of negative cursor x-coordinate
authorChristoph Bumiller <e0425955@student.tuwien.ac.at>
Thu, 26 Jul 2012 18:53:19 +0000 (20:53 +0200)
committerBen Skeggs <bskeggs@redhat.com>
Mon, 13 Aug 2012 23:36:24 +0000 (09:36 +1000)
Signed-off-by: Christoph Bumiller <e0425955@student.tuwien.ac.at>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Cc: stable@vger.kernel.org
drivers/gpu/drm/nouveau/nvd0_display.c

index d0d60e1e7f95bf74c7209f81f6cd205edd8d71a5..dac525b2994ee4bd28ff862625e7a6fe7649d2cd 100644 (file)
@@ -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;
 }