pipe-loader: use radeonsi for MM if amdgpu dri is used

Submitted by Jeremy Newton on July 15, 2019, 1:58 p.m.

Details

Message ID 20190715135856.26415-1-Jeremy.Newton@amd.com
State New
Headers show
Series "pipe-loader: use radeonsi for MM if amdgpu dri is used" ( rev: 2 ) in Mesa

Not browsing as part of any series.

Commit Message

Jeremy Newton July 15, 2019, 1:58 p.m.
Thanks Marek and Michel, see the updated patch below:

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(+)

Patch hide | download patch | download mbox

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;

Comments

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;
>
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;

>>

>

On 2019-07-15 4:11 p.m., Newton, Jeremy wrote:
> Sorry about that, I've only used git email maybe three times in my life :)

Nothing to apologize for, everybody has to learn that kind of thing. :)
On 2019-07-15 at 16:01, Jeremy Newton <alexjnewt@gmail.com> wrote:
> Thanks Marek and Michel, see the updated patch below:
> 
> 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>

All the tools expect valid email addresses; could you please fix those?

> ---
>  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;
> -- 
> 2.20.1
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Am 15.07.19 um 16:15 schrieb Michel Dänzer:
> On 2019-07-15 4:11 p.m., Newton, Jeremy wrote:
>> Sorry about that, I've only used git email maybe three times in my life :)
> Nothing to apologize for, everybody has to learn that kind of thing. :)

To be honest even after more than a decade I still get this wrong from 
time to time.

So really don't worry about stuff like that :)

Christian.