From 1973d79e274900ce687a002b94cb5b692aad9494 Mon Sep 17 00:00:00 2001 From: Alexandre Courbot Date: Tue, 27 May 2014 16:03:01 +0900 Subject: nvc0: add GK20A 3D class GK20A is mostly compatible with GK104, but features a new 3D class. Add it to the relevant header and use it when GK20A is detected. Signed-off-by: Alexandre Courbot Reviewed-by: Ilia Mirkin --- src/gallium/drivers/nouveau/nv_object.xml.h | 1 + src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'src/gallium/drivers/nouveau') diff --git a/src/gallium/drivers/nouveau/nv_object.xml.h b/src/gallium/drivers/nouveau/nv_object.xml.h index 4c93e656483..0a0e187dc02 100644 --- a/src/gallium/drivers/nouveau/nv_object.xml.h +++ b/src/gallium/drivers/nouveau/nv_object.xml.h @@ -190,6 +190,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define NVC8_3D_CLASS 0x00009297 #define NVE4_3D_CLASS 0x0000a097 #define NVF0_3D_CLASS 0x0000a197 +#define NVEA_3D_CLASS 0x0000a297 #define GM107_3D_CLASS 0x0000b097 #define NV50_2D_CLASS 0x0000502d #define NVC0_2D_CLASS 0x0000902d diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c index 9f89f3108b3..24f14fb4150 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c @@ -708,7 +708,14 @@ nvc0_screen_create(struct nouveau_device *dev) obj_class = NVF0_3D_CLASS; break; case 0xe0: - obj_class = NVE4_3D_CLASS; + switch (dev->chipset) { + case 0xea: + obj_class = NVEA_3D_CLASS; + break; + default: + obj_class = NVE4_3D_CLASS; + break; + } break; case 0xd0: obj_class = NVC8_3D_CLASS; -- cgit v1.2.3