From 283cd12933ae4d38a15f789b9e6b513c474fd080 Mon Sep 17 00:00:00 2001 From: Ilia Mirkin Date: Fri, 6 Jun 2014 15:36:27 -0400 Subject: nvc0: don't bother trying to set up compute for gk110+ The nouveau fw currently prints a bunch of errors. No point in seeing those all the time, esp since compute doesn't really work in the first place. Signed-off-by: Ilia Mirkin Reviewed-by: Ben Skeggs Cc: "10.2" Conflicts: src/gallium/drivers/nouveau/nvc0/nvc0_screen.c (cherry picked from commit ca65fc418f756496d480a9a4566543837a582826) --- src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c index 8f9493c0628..58d3e1b03b8 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c @@ -171,7 +171,7 @@ nvc0_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_VERTEX_ELEMENT_SRC_OFFSET_4BYTE_ALIGNED_ONLY: return 0; case PIPE_CAP_COMPUTE: - return (class_3d >= NVE4_3D_CLASS) ? 1 : 0; + return (class_3d == NVE4_3D_CLASS) ? 1 : 0; case PIPE_CAP_PREFER_BLIT_BASED_TEXTURE_TRANSFER: return 1; case PIPE_CAP_TEXTURE_BORDER_COLOR_QUIRK: @@ -211,7 +211,7 @@ nvc0_screen_get_shader_param(struct pipe_screen *pscreen, unsigned shader, case PIPE_SHADER_FRAGMENT: break; case PIPE_SHADER_COMPUTE: - if (class_3d < NVE4_3D_CLASS) + if (class_3d != NVE4_3D_CLASS) return 0; break; default: @@ -514,9 +514,10 @@ nvc0_screen_init_compute(struct nvc0_screen *screen) return nvc0_screen_compute_setup(screen, screen->base.pushbuf); return 0; case 0xe0: + return nve4_screen_compute_setup(screen, screen->base.pushbuf); case 0xf0: case 0x100: - return nve4_screen_compute_setup(screen, screen->base.pushbuf); + return 0; default: return -1; } -- cgit v1.2.3