drm/nouveau/kms/gf100: use correct format modifiers
authorBen Skeggs <bskeggs@redhat.com>
Fri, 24 Jul 2020 03:26:40 +0000 (13:26 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Fri, 24 Jul 2020 08:33:13 +0000 (18:33 +1000)
The disp015x classes are used by both gt21x and gf1xx (aside from gf119), but page
kinds differ between Tesla and Fermi.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/dispnv50/disp.c

index 519f998..dc90d4f 100644 (file)
@@ -2506,7 +2506,7 @@ nv50_display_create(struct drm_device *dev)
        if (disp->disp->object.oclass >= TU102_DISP)
                nouveau_display(dev)->format_modifiers = wndwc57e_modifiers;
        else
-       if (disp->disp->object.oclass >= GF110_DISP)
+       if (drm->client.device.info.family >= NV_DEVICE_INFO_V0_FERMI)
                nouveau_display(dev)->format_modifiers = disp90xx_modifiers;
        else
                nouveau_display(dev)->format_modifiers = disp50xx_modifiers;