t a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c                                                                                          
index ce37cbd274da..1e3d1d933dc1 100644      
--- a/drivers/gpu/drm/nouveau/nv50_display.c 
+++ b/drivers/gpu/drm/nouveau/nv50_display.c 
@@ -4483,11 +4483,13 @@ nv50_display_create(struct drm_device *dev)                        
                                             
        /* create crtc objects to represent the hw heads */                                
        if (disp->disp->oclass >= GF110_DISP)                                              
-               crtcs = nvif_rd32(&device->object, 0x022448);                              
+               crtcs = nvif_rd32(&device->object, 0x612004) & 0xf;                        
        else                                 
-               crtcs = 2;                   
+               crtcs = 0x3;                 
                                             
-       for (i = 0; i < crtcs; i++) {        
+       for (i = 0; i < fls(crtcs); i++) {   
+               if (!(crtcs & (1 << i)))     
+                       continue;            
                ret = nv50_head_create(dev, i);                                            
                if (ret)                     
                        goto out;            
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c                                                                    
index 781b59386e9c..49d0ba96092e 100644      
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c                                    
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c                                    
@@ -2754,6 +2754,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func,                
                case 0x134: device->chip = &nv134_chipset; break;                          
                case 0x136: device->chip = &nv136_chipset; break;                          
                case 0x137: device->chip = &nv137_chipset; break;                          
+               case 0x138: device->chip = &nv137_chipset; break;                          
                default:                     
                        nvdev_error(device, "unknown chipset (%08x)\n", boot0);            
                        goto done;           
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c                                                                      
index 7b346ccc38b7..75a31916eafc 100644      
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c                                     
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c                                     
@@ -501,7 +501,7 @@ int                      
 gf119_disp_new_(const struct nv50_disp_func *func, struct nvkm_device *device,            
                int index, struct nvkm_disp **pdisp)                                       
 {                                           
-       u32 heads = nvkm_rd32(device, 0x022448);                                           
+       u32 heads = fls(nvkm_rd32(device, 0x612004) & 0xf);                                
        return nv50_disp_new_(func, device, index, heads, pdisp);                          
 }