drm/nvd0/disp: mask off high 16 bit of negative cursor x-coordinate

Christoph Bumiller · Ben Skeggs · commit af5e7d84b0ec · 2012-08-14T09:36:24.000+10:00
Signed-off-by: Christoph Bumiller &lt;e0425955@student.tuwien.ac.at&gt;
Signed-off-by: Ben Skeggs &lt;bskeggs@redhat.com&gt;
Cc: stable@vger.kernel.org
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -790,7 +790,7 @@ nvd0_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)`
`790`	`790`	`struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);`
`791`	`791`	`int ch = EVO_CURS(nv_crtc->index);`
`792`	`792`
`793`		`- evo_piow(crtc->dev, ch, 0x0084, (y << 16) \| x);`
	`793`	`+ evo_piow(crtc->dev, ch, 0x0084, (y << 16) \| (x & 0xffff));`
`794`	`794`	`evo_piow(crtc->dev, ch, 0x0080, 0x00000000);`
`795`	`795`	`return 0;`
`796`	`796`	`}`