nvc0: recognise ga10x chipsets

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Acked-by: M Henning <drawoc@darkrefraction.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17633>

diff --git a/src/gallium/drivers/nouveau/nv_object.xml.h b/src/gallium/drivers/nouveau/nv_object.xml.h
index 6cfc26935e5f4c257c6731296c72991183a70ac7..7931096648b4d1212259683cb76f03b99ac60f4c 100644 (file)
--- a/src/gallium/drivers/nouveau/nv_object.xml.h
+++ b/src/gallium/drivers/nouveau/nv_object.xml.h
@@ -197,6 +197,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define GP102_3D_CLASS                                         0x0000c197
 #define GV100_3D_CLASS                                         0x0000c397
 #define TU102_3D_CLASS                                         0x0000c597
+#define GA102_3D_CLASS                                         0x0000c797
 #define NV50_2D_CLASS                                          0x0000502d
 #define NVC0_2D_CLASS                                          0x0000902d
 #define NV50_COMPUTE_CLASS                                     0x000050c0
@@ -211,6 +212,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define GP104_COMPUTE_CLASS                                    0x0000c1c0
 #define GV100_COMPUTE_CLASS                                    0x0000c3c0
 #define TU102_COMPUTE_CLASS                                    0x0000c5c0
+#define GA102_COMPUTE_CLASS                                    0x0000c7c0
 #define NV84_CRYPT_CLASS                                       0x000074c1
 #define BLOB_NVC0_PCOPY1_CLASS                                 0x000090b8
 #define BLOB_NVC0_PCOPY0_CLASS                                 0x000090b5
@@ -220,6 +222,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define PASCAL_DMA_COPY_B                                      0x0000c1b5
 #define VOLTA_DMA_COPY_A                                       0x0000c3b5
 #define TURING_DMA_COPY_A                                      0x0000c5b5
+#define AMPERE_DMA_COPY_A                                      0x0000c6b5
+#define AMPERE_DMA_COPY_B                                      0x0000c7b5
 #define NVE4_P2MF_CLASS                                                0x0000a040
 #define NVF0_P2MF_CLASS                                                0x0000a140
 #define NV31_MPEG_CLASS                                                0x00003174

diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
index f949c32c2a083984b56b002096dfabff9fa654bd..8bafc09178f6d56e4ca817408942f616fd9add7f 100644 (file)
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
@@ -883,6 +883,7 @@ static int
 nvc0_screen_init_compute(struct nvc0_screen *screen)
 {
    const struct nouveau_mclass computes[] = {
+      { GA102_COMPUTE_CLASS, -1 },
       { TU102_COMPUTE_CLASS, -1 },
       { GV100_COMPUTE_CLASS, -1 },
       { GP104_COMPUTE_CLASS, -1 },
@@ -1073,6 +1074,7 @@ nvc0_screen_create(struct nouveau_device *dev)
    case 0x130:
    case 0x140:
    case 0x160:
+   case 0x170:
       break;
    default:
       return NULL;
@@ -1171,6 +1173,8 @@ nvc0_screen_create(struct nouveau_device *dev)
 
    if (screen->m2mf->oclass >= NVE4_P2MF_CLASS) {
       const struct nouveau_mclass copys[] = {
+         {  AMPERE_DMA_COPY_B, -1 },
+         {  AMPERE_DMA_COPY_A, -1 },
          {  TURING_DMA_COPY_A, -1 },
          {   VOLTA_DMA_COPY_A, -1 },
          {  PASCAL_DMA_COPY_B, -1 },
@@ -1219,6 +1223,7 @@ nvc0_screen_create(struct nouveau_device *dev)
    PUSH_DATA (push, screen->fence.bo->offset + 16);
 
    const struct nouveau_mclass threeds[] = {
+      { GA102_3D_CLASS, -1 },
       { TU102_3D_CLASS, -1 },
       { GV100_3D_CLASS, -1 },
       { GP102_3D_CLASS, -1 },

diff --git a/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c b/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c
index e717fc1fe8f66aaab5b6ce02224587383fe74e42..3df4a67a6d9300210a568353b923decd34d1369f 100644 (file)
--- a/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c
+++ b/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c
@@ -107,6 +107,7 @@ nouveau_drm_screen_create(int fd)
        case 0x130:
        case 0x140:
        case 0x160:
+       case 0x170:
                init = nvc0_screen_create;
                break;
        default: