drm/nouveau/disp/gf119-: avoid creating non-existent heads

We assume that each board has 4 heads for GF119+. However this is not
necessarily true - in the case of a GP108 board, the register indicated
that there were only 2.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101601
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index f7b4326a464176f4b6834bc4646440103a39381c..1449a2c8a1e9244eb79d1fa6a58152c2ee42fdf0 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -4451,11 +4451,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/disp/headgf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/headgf119.c
index b335527576472c252cbdf7f6457fdebf2d928331..9fd7ae3313080e4c1a727a43c9bcb553e4390651 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/headgf119.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/headgf119.c
@@ -92,5 +92,8 @@ gf119_head = {
 int
 gf119_head_new(struct nvkm_disp *disp, int id)
 {
+       struct nvkm_device *device = disp->engine.subdev.device;
+       if (!(nvkm_rd32(device, 0x612004) & (0x00000001 << id)))
+               return 0;
        return nvkm_head_new_(&gf119_head, disp, id);
 }