---

yaml --- r: 269692 b: refs/heads/master c: c20ab3e h: refs/heads/master v: v3
git-mirror · Sep 20, 2011 · ec0b5e2 · ec0b5e2
1 parent 72608b1
commit ec0b5e2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff920bfbe63f240bca6c86ee26daca8a1c43f780
+refs/heads/master: c20ab3e1cb0bb8e2c9a54a49b4637c61512ed856
diff --git a/trunk/drivers/gpu/drm/nouveau/nvd0_display.c b/trunk/drivers/gpu/drm/nouveau/nvd0_display.c
@@ -522,6 +522,16 @@ static const struct drm_crtc_funcs nvd0_crtc_func = {
 	.destroy = nvd0_crtc_destroy,
 };
 
+static void
+nvd0_cursor_set_pos(struct nouveau_crtc *nv_crtc, int x, int y)
+{
+}
+
+static void
+nvd0_cursor_set_offset(struct nouveau_crtc *nv_crtc, uint32_t offset)
+{
+}
+
 static int
 nvd0_crtc_create(struct drm_device *dev, int index)
 {
@@ -536,6 +546,8 @@ nvd0_crtc_create(struct drm_device *dev, int index)
 	nv_crtc->index = index;
 	nv_crtc->set_dither = nvd0_crtc_set_dither;
 	nv_crtc->set_scale = nvd0_crtc_set_scale;
+	nv_crtc->cursor.set_offset = nvd0_cursor_set_offset;
+	nv_crtc->cursor.set_pos = nvd0_cursor_set_pos;
 	for (i = 0; i < 256; i++) {
 		nv_crtc->lut.r[i] = i << 8;
 		nv_crtc->lut.g[i] = i << 8;