From 4ee23709724ff696db6613aba155963a1d8e0a41 Mon Sep 17 00:00:00 2001 From: Karol Herbst Date: Mon, 13 Apr 2020 16:07:18 +0200 Subject: [PATCH] nvc0: enable ASTC and ETC on GM20B Signed-off-by: Karol Herbst Reviewed-by: Ilia Mirkin Part-of: --- src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c index 9b241c6c39e..f8550be7082 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c @@ -75,14 +75,12 @@ nvc0_screen_is_format_supported(struct pipe_screen *pscreen, sample_count > 1) return false; - /* Restrict ETC2 and ASTC formats here. These are only supported on GK20A. + /* Restrict ETC2 and ASTC formats here. These are only supported on GK20A + * and GM20B. */ if ((desc->layout == UTIL_FORMAT_LAYOUT_ETC || desc->layout == UTIL_FORMAT_LAYOUT_ASTC) && - /* The claim is that this should work on GM107 but it doesn't. Need to - * test further and figure out if it's a nouveau issue or a HW one. - nouveau_screen(pscreen)->class_3d < GM107_3D_CLASS && - */ + nouveau_screen(pscreen)->device->chipset != 0x12b && nouveau_screen(pscreen)->class_3d != NVEA_3D_CLASS) return false; -- 2.30.2