aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2011-08-25 00:09:43 -0400
committerBen Skeggs <bskeggs@redhat.com>2011-09-20 02:12:08 -0400
commitc20ab3e1cb0bb8e2c9a54a49b4637c61512ed856 (patch)
treeb74b72bc2c16b7320d9a908ac9eed357ed3faffc /drivers/gpu/drm/nouveau
parentff920bfbe63f240bca6c86ee26daca8a1c43f780 (diff)
drm/nvd9/disp: stub some more api hooks so we don't oops on resume
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
-rw-r--r--drivers/gpu/drm/nouveau/nvd0_display.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvd0_display.c b/drivers/gpu/drm/nouveau/nvd0_display.c
index 20ab2c249b82..20072fb784a5 100644
--- a/drivers/gpu/drm/nouveau/nvd0_display.c
+++ b/drivers/gpu/drm/nouveau/nvd0_display.c
@@ -522,6 +522,16 @@ static const struct drm_crtc_funcs nvd0_crtc_func = {
522 .destroy = nvd0_crtc_destroy, 522 .destroy = nvd0_crtc_destroy,
523}; 523};
524 524
525static void
526nvd0_cursor_set_pos(struct nouveau_crtc *nv_crtc, int x, int y)
527{
528}
529
530static void
531nvd0_cursor_set_offset(struct nouveau_crtc *nv_crtc, uint32_t offset)
532{
533}
534
525static int 535static int
526nvd0_crtc_create(struct drm_device *dev, int index) 536nvd0_crtc_create(struct drm_device *dev, int index)
527{ 537{
@@ -536,6 +546,8 @@ nvd0_crtc_create(struct drm_device *dev, int index)
536 nv_crtc->index = index; 546 nv_crtc->index = index;
537 nv_crtc->set_dither = nvd0_crtc_set_dither; 547 nv_crtc->set_dither = nvd0_crtc_set_dither;
538 nv_crtc->set_scale = nvd0_crtc_set_scale; 548 nv_crtc->set_scale = nvd0_crtc_set_scale;
549 nv_crtc->cursor.set_offset = nvd0_cursor_set_offset;
550 nv_crtc->cursor.set_pos = nvd0_cursor_set_pos;
539 for (i = 0; i < 256; i++) { 551 for (i = 0; i < 256; i++) {
540 nv_crtc->lut.r[i] = i << 8; 552 nv_crtc->lut.r[i] = i << 8;
541 nv_crtc->lut.g[i] = i << 8; 553 nv_crtc->lut.g[i] = i << 8;