Mesa (master): nvc0: don't bother trying to set up compute for gk110+
Ilia Mirkin
imirkin at kemper.freedesktop.org
Fri Jun 6 22:28:14 UTC 2014
Module: Mesa
Branch: master
Commit: ca65fc418f756496d480a9a4566543837a582826
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ca65fc418f756496d480a9a4566543837a582826
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Fri Jun 6 15:36:27 2014 -0400
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 <imirkin at alum.mit.edu>
Reviewed-by: Ben Skeggs <bskeggs at redhat.com>
Cc: "10.2" <mesa-stable at lists.freedesktop.org>
---
src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
index 0537542..3e6b011 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:
@@ -214,7 +214,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:
@@ -528,9 +528,9 @@ 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);
case 0x110:
return 0;
default:
More information about the mesa-commit
mailing list