diff options
author | Ilia Mirkin <imirkin@alum.mit.edu> | 2016-08-27 21:32:34 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2016-10-12 03:29:29 -0400 |
commit | 1cc88ab9542441b3371104872eefc4924408aaa3 (patch) | |
tree | 0d8b8032fea1e2b64cb4fe7cca8ecdd405786cf8 /drivers/gpu | |
parent | 8d021d71b3247937a26ffdf313fd53a9d58778b7 (diff) |
drm/nouveau/gr/nv3x: add 0x0597 kelvin 3d class support
Tested on a NV34. There are reports of this also working on the other
nv3x chips. Largely useful for testing software written for NV2x without
having the actual hardware available.
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/gr/nv30.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/gr/nv35.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv30.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv30.c index f1e15a4d4f64..b4e3c50badc7 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv30.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv30.c | |||
@@ -187,6 +187,7 @@ nv30_gr = { | |||
187 | { -1, -1, 0x038a, &nv04_gr_object }, /* ifc (nv30) */ | 187 | { -1, -1, 0x038a, &nv04_gr_object }, /* ifc (nv30) */ |
188 | { -1, -1, 0x039e, &nv04_gr_object }, /* swzsurf (nv30) */ | 188 | { -1, -1, 0x039e, &nv04_gr_object }, /* swzsurf (nv30) */ |
189 | { -1, -1, 0x0397, &nv04_gr_object }, /* rankine */ | 189 | { -1, -1, 0x0397, &nv04_gr_object }, /* rankine */ |
190 | { -1, -1, 0x0597, &nv04_gr_object }, /* kelvin */ | ||
190 | {} | 191 | {} |
191 | } | 192 | } |
192 | }; | 193 | }; |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c index 300f5ed5de0b..e7ed04b935cd 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c | |||
@@ -123,6 +123,7 @@ nv34_gr = { | |||
123 | { -1, -1, 0x0389, &nv04_gr_object }, /* sifm (nv30) */ | 123 | { -1, -1, 0x0389, &nv04_gr_object }, /* sifm (nv30) */ |
124 | { -1, -1, 0x038a, &nv04_gr_object }, /* ifc (nv30) */ | 124 | { -1, -1, 0x038a, &nv04_gr_object }, /* ifc (nv30) */ |
125 | { -1, -1, 0x039e, &nv04_gr_object }, /* swzsurf (nv30) */ | 125 | { -1, -1, 0x039e, &nv04_gr_object }, /* swzsurf (nv30) */ |
126 | { -1, -1, 0x0597, &nv04_gr_object }, /* kelvin */ | ||
126 | { -1, -1, 0x0697, &nv04_gr_object }, /* rankine */ | 127 | { -1, -1, 0x0697, &nv04_gr_object }, /* rankine */ |
127 | {} | 128 | {} |
128 | } | 129 | } |
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv35.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv35.c index 740df0f52c38..5e8abacbacc6 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv35.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv35.c | |||
@@ -124,6 +124,7 @@ nv35_gr = { | |||
124 | { -1, -1, 0x038a, &nv04_gr_object }, /* ifc (nv30) */ | 124 | { -1, -1, 0x038a, &nv04_gr_object }, /* ifc (nv30) */ |
125 | { -1, -1, 0x039e, &nv04_gr_object }, /* swzsurf (nv30) */ | 125 | { -1, -1, 0x039e, &nv04_gr_object }, /* swzsurf (nv30) */ |
126 | { -1, -1, 0x0497, &nv04_gr_object }, /* rankine */ | 126 | { -1, -1, 0x0497, &nv04_gr_object }, /* rankine */ |
127 | { -1, -1, 0x0597, &nv04_gr_object }, /* kelvin */ | ||
127 | {} | 128 | {} |
128 | } | 129 | } |
129 | }; | 130 | }; |