Merge branch '7.8'

[mesa.git] / src / gallium / winsys / drm / nouveau / drm / nouveau_drm_api.c

diff --git a/src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c b/src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c
index 21517b4bb54dc977ded206cc8bb210405df532e7..716d4bacd3bfa1b6931a4714a68b6788730b515a 100644 (file)
--- a/src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c
+++ b/src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c
@@ -86,11 +86,9 @@ nouveau_drm_create_screen(struct drm_api *api, int fd,
 
        switch (dev->chipset & 0xf0) {
        case 0x30:
-               init = nv30_screen_create;
-               break;
        case 0x40:
        case 0x60:
-               init = nv40_screen_create;
+               init = nvfx_screen_create;
                break;
        case 0x50:
        case 0x80: