nvc0: use PascalB for most Pascal boards

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/src/gallium/drivers/nouveau/nv_object.xml.h b/src/gallium/drivers/nouveau/nv_object.xml.h
index c7e0a397d67e605e819fa542071869c654f5fc2f..f200c9c9c9b7d79f957aa29497f1bb56418c075b 100644 (file)
--- a/src/gallium/drivers/nouveau/nv_object.xml.h
+++ b/src/gallium/drivers/nouveau/nv_object.xml.h
@@ -194,6 +194,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define GM107_3D_CLASS                                         0x0000b097
 #define GM200_3D_CLASS                                         0x0000b197
 #define GP100_3D_CLASS                                         0x0000c097
+#define GP102_3D_CLASS                                         0x0000c197
 #define NV50_2D_CLASS                                          0x0000502d
 #define NVC0_2D_CLASS                                          0x0000902d
 #define NV50_COMPUTE_CLASS                                     0x000050c0

diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
index 30efac822331947b5f91d647c602dbc3150619b7..6a67b268d803d9a4ec85c0001899c7bd861aebad 100644 (file)
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
@@ -898,7 +898,14 @@ nvc0_screen_create(struct nouveau_device *dev)
 
    switch (dev->chipset & ~0xf) {
    case 0x130:
-      obj_class = GP100_3D_CLASS;
+      switch (dev->chipset) {
+      case 0x130:
+         obj_class = GP100_3D_CLASS;
+         break;
+      default:
+         obj_class = GP102_3D_CLASS;
+         break;
+      }
       break;
    case 0x120:
       obj_class = GM200_3D_CLASS;