[Mesa-dev] [PATCH] pipe-loader: use radeonsi for MM if amdgpu dri is used

[Newton, Jeremy]

Sorry about that, I've only used git email maybe three times in my life :)

On 2019-07-15 10:09 a.m., Michel Dänzer wrote:
> On 2019-07-15 3:58 p.m., Jeremy Newton wrote:
>> Thanks Marek and Michel, see the updated patch below:
> FYI, this kind of commentary should be after the --- line, or it will be
> included as part of the Git commit log by tools like "git am".
>
>
>> The amdgpu dri is used for the closed source AMD driver. Since this driver
>> does not implement multimedia, we fall back to radeonsi in mesa to do
>> multimedia. This corrects the Gallium driver name for when it is set to
>> amdgpu.
>>
>> This will allow dropping the amdgpu-pro specific GBM implementation in
>> favour of Mesa's libgbm.
>>
>> Signed-off-by: Jeremy Newton <Jeremy.Newton at amd.com>
>> Signed-off-by: Marek Olšák <marek.olsak at amd.com>
>> Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
>> ---
>>   src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c | 5 +++++
>>   1 file changed, 5 insertions(+)
>>
>> diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
>> index 960d63b2c31..6e889539c92 100644
>> --- a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
>> +++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
>> @@ -194,6 +194,11 @@ pipe_loader_drm_probe_fd_nodup(struct pipe_loader_device **dev, int fd)
>>      if (!ddev->base.driver_name)
>>         goto fail;
>>   
>> +   if (strcmp(ddev->base.driver_name, "amdgpu") == 0) {
>> +      FREE(ddev->base.driver_name);
>> +      ddev->base.driver_name = strdup("radeonsi");
>> +   }
>> +
>>      struct util_dl_library **plib = NULL;
>>   #ifndef GALLIUM_STATIC_TARGETS
>>      plib = &ddev->lib;
>>
>