[Mesa-dev] [PATCH 13/16] nvc0: enable compute support by default on Fermi

[Samuel Pitoiset]

On 10/17/2015 09:11 PM, Jan Vesely wrote:
> Does this mean it should be possible to hook up clover with nouveau?

As I said Ilia, this is just the ability to launch compute kernels on Fermi.
Unfortunately, OpenCL is still not supported by Nouveau but I hope this 
is going to change.

>
> Jan
>
> On Fri, 2015-10-16 at 19:22 +0200, Samuel Pitoiset wrote:
>> Compute support was not enabled by default because weird effects
>> on 3D state happened, but I can't reproduce them anymore.
>>
>> This also enables MP performance counters by default on Fermi.
>>
>> Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
>> ---
>>   src/gallium/drivers/nouveau/nvc0/nvc0_query.c  | 3 +--
>>   src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 7 +------
>>   2 files changed, 2 insertions(+), 8 deletions(-)
>>
>> diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_query.c
>> b/src/gallium/drivers/nouveau/nvc0/nvc0_query.c
>> index c81b85a..80f311b 100644
>> --- a/src/gallium/drivers/nouveau/nvc0/nvc0_query.c
>> +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_query.c
>> @@ -291,7 +291,6 @@ nvc0_screen_get_driver_query_info(struct
>> pipe_screen *pscreen,
>>               count += NVE4_HW_SM_QUERY_COUNT;
>>            } else
>>            if (screen->base.class_3d < NVE4_3D_CLASS) {
>> -            /* NVC0_COMPUTE is not always enabled */
>>               count += NVC0_HW_SM_QUERY_COUNT;
>>            }
>>         }
>> @@ -358,7 +357,7 @@ nvc0_screen_get_driver_query_group_info(struct
>> pipe_screen *pscreen,
>>               count++;
>>            } else
>>            if (screen->base.class_3d < NVE4_3D_CLASS) {
>> -            count++; /* NVC0_COMPUTE is not always enabled */
>> +            count++;
>>            }
>>         }
>>      }
>> diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
>> b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
>> index ba53d10..d6a4ac5 100644
>> --- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
>> +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
>> @@ -561,12 +561,7 @@ nvc0_screen_init_compute(struct nvc0_screen
>> *screen)
>>      switch (screen->base.device->chipset & ~0xf) {
>>      case 0xc0:
>>      case 0xd0:
>> -      /* Using COMPUTE has weird effects on 3D state, we need to
>> -       * investigate this further before enabling it by default.
>> -       */
>> -      if (debug_get_bool_option("NVC0_COMPUTE", false))
>> -         return nvc0_screen_compute_setup(screen, screen
>> ->base.pushbuf);
>> -      return 0;
>> +      return nvc0_screen_compute_setup(screen, screen
>> ->base.pushbuf);
>>      case 0xe0:
>>         return nve4_screen_compute_setup(screen, screen
>> ->base.pushbuf);
>>      case 0xf0: