diff options
author | Ilia Mirkin <imirkin@alum.mit.edu> | 2015-10-07 18:39:33 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-11-03 00:02:18 -0500 |
commit | 2e69a5cd25a131cf283d3b655c01fb6db15dd60c (patch) | |
tree | d2fb459fb825b8fae14c8441182fc19b781d56fb | |
parent | 3988f645f053a6889d00324dac3e57bd62cb8900 (diff) |
drm/nouveau/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-- | drivers/gpu/drm/nouveau/nvkm/engine/gr/gf110.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/gr/gf117.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/gr/gf119.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf110.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf110.c index d13187409d68..d081ee41fc14 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf110.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf110.c | |||
@@ -98,6 +98,7 @@ gf110_gr = { | |||
98 | { -1, -1, FERMI_B, &gf100_fermi }, | 98 | { -1, -1, FERMI_B, &gf100_fermi }, |
99 | { -1, -1, FERMI_C, &gf100_fermi }, | 99 | { -1, -1, FERMI_C, &gf100_fermi }, |
100 | { -1, -1, FERMI_COMPUTE_A }, | 100 | { -1, -1, FERMI_COMPUTE_A }, |
101 | { -1, -1, FERMI_COMPUTE_B }, | ||
101 | {} | 102 | {} |
102 | } | 103 | } |
103 | }; | 104 | }; |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf117.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf117.c index 28483d8bf3d2..d8e8af4d3b30 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf117.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf117.c | |||
@@ -135,6 +135,7 @@ gf117_gr = { | |||
135 | { -1, -1, FERMI_B, &gf100_fermi }, | 135 | { -1, -1, FERMI_B, &gf100_fermi }, |
136 | { -1, -1, FERMI_C, &gf100_fermi }, | 136 | { -1, -1, FERMI_C, &gf100_fermi }, |
137 | { -1, -1, FERMI_COMPUTE_A }, | 137 | { -1, -1, FERMI_COMPUTE_A }, |
138 | { -1, -1, FERMI_COMPUTE_B }, | ||
138 | {} | 139 | {} |
139 | } | 140 | } |
140 | }; | 141 | }; |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf119.c index 9811a72e0313..01faf9a73774 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf119.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf119.c | |||
@@ -189,6 +189,7 @@ gf119_gr = { | |||
189 | { -1, -1, FERMI_B, &gf100_fermi }, | 189 | { -1, -1, FERMI_B, &gf100_fermi }, |
190 | { -1, -1, FERMI_C, &gf100_fermi }, | 190 | { -1, -1, FERMI_C, &gf100_fermi }, |
191 | { -1, -1, FERMI_COMPUTE_A }, | 191 | { -1, -1, FERMI_COMPUTE_A }, |
192 | { -1, -1, FERMI_COMPUTE_B }, | ||
192 | {} | 193 | {} |
193 | } | 194 | } |
194 | }; | 195 | }; |