diff options
| author | Ilia Mirkin <[email protected]> | 2014-06-06 15:36:27 -0400 |
|---|---|---|
| committer | Ilia Mirkin <[email protected]> | 2014-06-06 18:25:35 -0400 |
| commit | ca65fc418f756496d480a9a4566543837a582826 (patch) | |
| tree | cede676ad07cbb9f0002862085e08c88e7741163 /src | |
| parent | b9ec766bd02d55c20ff7ce5b95207ea7f6ed1de5 (diff) | |
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 <[email protected]>
Reviewed-by: Ben Skeggs <[email protected]>
Cc: "10.2" <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 6 |
1 files 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 0537542e6ce..3e6b0116e3c 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: |