[PATCH 2/2] drm/amdgpu: Add Aldebaran virtualization support

[Alex Deucher]

On Thu, Apr 29, 2021 at 4:13 PM Zhigang Luo <zhigang.luo at amd.com> wrote:
>
> 1. add Aldebaran in virtualization detection list.
> 2. disable Aldebaran virtual display support as there is no GFX
>    engine in Aldebaran.
> 3. skip TMR loading if Aldebaran is in virtualizatin mode as it
>    shares the one host loaded.
>
> Signed-off-by: Zhigang Luo <zhigang.luo at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c  | 1 +
>  drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 9 ++++++---
>  2 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> index 623044414bb5..17b728d2c1f2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> @@ -422,6 +422,7 @@ static bool psp_skip_tmr(struct psp_context *psp)
>         switch (psp->adev->asic_type) {
>         case CHIP_NAVI12:
>         case CHIP_SIENNA_CICHLID:
> +       case CHIP_ALDEBARAN:
>                 return true;
>         default:
>                 return false;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> index 0c9c5255aa42..691066e9c1f3 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> @@ -50,9 +50,11 @@ void amdgpu_virt_init_setting(struct amdgpu_device *adev)
>         struct drm_device *ddev = adev_to_drm(adev);
>
>         /* enable virtual display */
> -       if (adev->mode_info.num_crtc == 0)
> -               adev->mode_info.num_crtc = 1;
> -       adev->enable_virtual_display = true;
> +       if (adev->asic_type != CHIP_ALDEBARAN) {

We should check for ARCTURUS here as well.

Alex

> +               if (adev->mode_info.num_crtc == 0)
> +                       adev->mode_info.num_crtc = 1;
> +               adev->enable_virtual_display = true;
> +       }
>         ddev->driver_features &= ~DRIVER_ATOMIC;
>         adev->cg_flags = 0;
>         adev->pg_flags = 0;
> @@ -679,6 +681,7 @@ void amdgpu_detect_virtualization(struct amdgpu_device *adev)
>                 case CHIP_VEGA10:
>                 case CHIP_VEGA20:
>                 case CHIP_ARCTURUS:
> +               case CHIP_ALDEBARAN:
>                         soc15_set_virt_ops(adev);
>                         break;
>                 case CHIP_NAVI10:
> --
> 2.17.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx