summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Mirkin <imirkin@alum.mit.edu>2015-10-07 18:39:33 -0400
committerBen Skeggs <bskeggs@redhat.com>2015-10-22 09:11:27 +1000
commit51755d7b05f5417e227df62dc8f33890e33fdf0a (patch)
treef8db66a1391b13917736434a1caf98c59bbe33bf
parent781380254b90ad258635bc24a86b13b59cefea56 (diff)
downloadnouveau-51755d7b05f5417e227df62dc8f33890e33fdf0a.tar.gz
gr: add FERMI_COMPUTE_B class to GF110+
GF110+ supports both the A and B compute classes, make sure to accept both. Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drm/nouveau/nvkm/engine/gr/gf110.c1
-rw-r--r--drm/nouveau/nvkm/engine/gr/gf117.c1
-rw-r--r--drm/nouveau/nvkm/engine/gr/gf119.c1
3 files changed, 3 insertions, 0 deletions
diff --git a/drm/nouveau/nvkm/engine/gr/gf110.c b/drm/nouveau/nvkm/engine/gr/gf110.c
index d13187409..d081ee41f 100644
--- a/drm/nouveau/nvkm/engine/gr/gf110.c
+++ b/drm/nouveau/nvkm/engine/gr/gf110.c
@@ -98,6 +98,7 @@ gf110_gr = {
{ -1, -1, FERMI_B, &gf100_fermi },
{ -1, -1, FERMI_C, &gf100_fermi },
{ -1, -1, FERMI_COMPUTE_A },
+ { -1, -1, FERMI_COMPUTE_B },
{}
}
};
diff --git a/drm/nouveau/nvkm/engine/gr/gf117.c b/drm/nouveau/nvkm/engine/gr/gf117.c
index 28483d8bf..d8e8af4d3 100644
--- a/drm/nouveau/nvkm/engine/gr/gf117.c
+++ b/drm/nouveau/nvkm/engine/gr/gf117.c
@@ -135,6 +135,7 @@ gf117_gr = {
{ -1, -1, FERMI_B, &gf100_fermi },
{ -1, -1, FERMI_C, &gf100_fermi },
{ -1, -1, FERMI_COMPUTE_A },
+ { -1, -1, FERMI_COMPUTE_B },
{}
}
};
diff --git a/drm/nouveau/nvkm/engine/gr/gf119.c b/drm/nouveau/nvkm/engine/gr/gf119.c
index 9811a72e0..01faf9a73 100644
--- a/drm/nouveau/nvkm/engine/gr/gf119.c
+++ b/drm/nouveau/nvkm/engine/gr/gf119.c
@@ -189,6 +189,7 @@ gf119_gr = {
{ -1, -1, FERMI_B, &gf100_fermi },
{ -1, -1, FERMI_C, &gf100_fermi },
{ -1, -1, FERMI_COMPUTE_A },
+ { -1, -1, FERMI_COMPUTE_B },
{}
}
};