drm/nv50-nvc0: switch to common disp impl, removing previous version

[platform/kernel/linux-rpi.git] / drivers / gpu / drm / nouveau / nouveau_display.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index f03b075..7a48f45 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -98,12 +98,12 @@ nouveau_framebuffer_init(struct drm_device *dev,
                        nv_fb->r_dma = NvEvoVRAM_LP;
 
                switch (fb->depth) {
-               case  8: nv_fb->r_format = NV50_EVO_CRTC_FB_DEPTH_8; break;
-               case 15: nv_fb->r_format = NV50_EVO_CRTC_FB_DEPTH_15; break;
-               case 16: nv_fb->r_format = NV50_EVO_CRTC_FB_DEPTH_16; break;
+               case  8: nv_fb->r_format = 0x1e00; break;
+               case 15: nv_fb->r_format = 0xe900; break;
+               case 16: nv_fb->r_format = 0xe800; break;
                case 24:
-               case 32: nv_fb->r_format = NV50_EVO_CRTC_FB_DEPTH_24; break;
-               case 30: nv_fb->r_format = NV50_EVO_CRTC_FB_DEPTH_30; break;
+               case 32: nv_fb->r_format = 0xcf00; break;
+               case 30: nv_fb->r_format = 0xd100; break;
                default:
                         NV_ERROR(drm, "unknown depth %d\n", fb->depth);
                         return -EINVAL;
@@ -366,9 +366,6 @@ nouveau_display_create(struct drm_device *dev)
                if (nv_device(drm->device)->card_type < NV_50)
                        ret = nv04_display_create(dev);
                else
-               if (nv_device(drm->device)->card_type < NV_D0)
-                       ret = nv50_display_create(dev);
-               else
                        ret = nvd0_display_create(dev);
                if (ret)
                        goto disp_create_err;
@@ -660,10 +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) {
-               if (nv_device(drm->device)->card_type >= NV_D0)
-                       ret = nvd0_display_flip_next(crtc, fb, chan, 0);
-               else
-                       ret = nv50_display_flip_next(crtc, fb, chan);
+               ret = nvd0_display_flip_next(crtc, fb, chan, 0);
                if (ret) {
                        mutex_unlock(&chan->cli->mutex);
                        goto fail_unreserve;