summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_display.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2012-11-21 14:40:21 +1000
committerBen Skeggs <bskeggs@redhat.com>2012-11-29 09:57:58 +1000
commite225f446a0808ce38b124df489d0568c05c3057a (patch)
treefb405dc8e8e1cd33a65bd455bdcc211d28557b5a /drivers/gpu/drm/nouveau/nouveau_display.c
parent4f6029da58ba9204c98e33f4f3737fe085c87a6f (diff)
downloadblackbird-op-linux-e225f446a0808ce38b124df489d0568c05c3057a.tar.gz
blackbird-op-linux-e225f446a0808ce38b124df489d0568c05c3057a.zip
drm/nouveau: rename nvd0_display to nv50_display to reflect reality since merge
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_display.c')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_display.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index 7a48f4578e1f..e4188f24fc75 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -366,7 +366,7 @@ nouveau_display_create(struct drm_device *dev)
if (nv_device(drm->device)->card_type < NV_50)
ret = nv04_display_create(dev);
else
- ret = nvd0_display_create(dev);
+ ret = nv50_display_create(dev);
if (ret)
goto disp_create_err;
@@ -657,7 +657,7 @@ nouveau_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb,
/* Emit a page flip */
if (nv_device(drm->device)->card_type >= NV_50) {
- ret = nvd0_display_flip_next(crtc, fb, chan, 0);
+ ret = nv50_display_flip_next(crtc, fb, chan, 0);
if (ret) {
mutex_unlock(&chan->cli->mutex);
goto fail_unreserve;
OpenPOWER on IntegriCloud