diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2014-11-03 14:33:01 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-11-10 10:26:09 +1000 |
| commit | 495c1a10e5078932c2e1e7bc1be5df9de9f70f1c (patch) | |
| tree | da32c0130e79f543d0d12df8dc146f42bb271c9d | |
| parent | ad507042914aafdda2771c0e698ed82fec313bfd (diff) | |
| download | nouveau-495c1a10e5078932c2e1e7bc1be5df9de9f70f1c.tar.gz | |
kms/nv50: remove a couple of cursor-related stub functions
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drm/nouveau_display.c | 2 | ||||
| -rw-r--r-- | drm/nv50_display.c | 12 |
2 files changed, 2 insertions, 12 deletions
diff --git a/drm/nouveau_display.c b/drm/nouveau_display.c index ba0adc1c5..95e50b914 100644 --- a/drm/nouveau_display.c +++ b/drm/nouveau_display.c @@ -633,6 +633,8 @@ nouveau_display_resume(struct drm_device *dev, bool runtime) struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc); u32 offset = nv_crtc->cursor.nvbo->bo.offset; + if (!nv_crtc->cursor.set_offset) + continue; nv_crtc->cursor.set_offset(nv_crtc, offset); nv_crtc->cursor.set_pos(nv_crtc, nv_crtc->cursor_saved_x, nv_crtc->cursor_saved_y); diff --git a/drm/nv50_display.c b/drm/nv50_display.c index 7d1ac1822..daff111a3 100644 --- a/drm/nv50_display.c +++ b/drm/nv50_display.c @@ -1342,16 +1342,6 @@ static const struct drm_crtc_funcs nv50_crtc_func = { .page_flip = nouveau_crtc_page_flip, }; -static void -nv50_cursor_set_pos(struct nouveau_crtc *nv_crtc, int x, int y) -{ -} - -static void -nv50_cursor_set_offset(struct nouveau_crtc *nv_crtc, uint32_t offset) -{ -} - static int nv50_crtc_create(struct drm_device *dev, int index) { @@ -1370,8 +1360,6 @@ nv50_crtc_create(struct drm_device *dev, int index) head->base.set_color_vibrance = nv50_crtc_set_color_vibrance; head->base.color_vibrance = 50; head->base.vibrant_hue = 0; - head->base.cursor.set_offset = nv50_cursor_set_offset; - head->base.cursor.set_pos = nv50_cursor_set_pos; for (i = 0; i < 256; i++) { head->base.lut.r[i] = i << 8; head->base.lut.g[i] = i << 8; |