summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Skeggs <[email protected]>2017-02-21 10:01:16 +1000
committerBen Skeggs <[email protected]>2017-02-21 10:01:16 +1000
commit8f4483b6090ce1e6f903dc14094b086d03c8af80 (patch)
tree0e60ff6696cc1ec6fb903017bb662e9111b675e1
parent6dbb0eaccc346ec5619b1782f7102353015eaa18 (diff)
nvc0: use PascalB for most Pascal boards
Signed-off-by: Ben Skeggs <[email protected]>
-rw-r--r--src/gallium/drivers/nouveau/nv_object.xml.h1
-rw-r--r--src/gallium/drivers/nouveau/nvc0/nvc0_screen.c9
2 files changed, 9 insertions, 1 deletions
diff --git a/src/gallium/drivers/nouveau/nv_object.xml.h b/src/gallium/drivers/nouveau/nv_object.xml.h
index c7e0a397d67..f200c9c9c9b 100644
--- 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 30efac82233..6a67b268d80 100644
--- 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;