[PATCH] drm/amd/amdgpu: Only reserve vram for firmware with vega10 MS_HYPERV host.

[PATCH] drm/amd/amdgpu: Only reserve vram for firmware with vega10 MS_HYPERV host.

[Yongqiang Sun]

Fixes: 8011a76ad370
("drm/amdgpu: Add stolen reserved memory for MI25 SRIOV.")

driver loading failed on VEGA10 SRIOV VF with linux host due to a wide
range of stolen reserved vram.
Since VEGA10 SRIOV VF need to reserve vram for firmware with windows
Hyper_V host specifically, check hypervisor type to only reserve
memory for it, and the range of the reserved vram can be limited
to between 5M-7M area.

Signed-off-by: Yongqiang Sun <yongqiang.sun@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
index a66a0881a934..3e9582c245bb 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
@@ -25,6 +25,7 @@
  */
 
 #include <linux/io-64-nonatomic-lo-hi.h>
+#include <asm/hypervisor.h>
 
 #include "amdgpu.h"
 #include "amdgpu_gmc.h"
@@ -647,11 +648,11 @@ void amdgpu_gmc_get_vbios_allocations(struct amdgpu_device *adev)
 	case CHIP_VEGA10:
 		adev->mman.keep_stolen_vga_memory = true;
 		/*
-		 * VEGA10 SRIOV VF needs some firmware reserved area.
+		 * VEGA10 SRIOV VF with MS_HYPERV host needs some firmware reserved area.
 		 */
-		if (amdgpu_sriov_vf(adev)) {
-			adev->mman.stolen_reserved_offset = 0x100000;
-			adev->mman.stolen_reserved_size = 0x600000;
+		if (amdgpu_sriov_vf(adev) && hypervisor_is_type(X86_HYPER_MS_HYPERV)) {
+			adev->mman.stolen_reserved_offset = 0x500000;
+			adev->mman.stolen_reserved_size = 0x200000;
 		}
 		break;
 	case CHIP_RAVEN:
-- 
2.25.1

Re: [PATCH] drm/amd/amdgpu: Only reserve vram for firmware with vega10 MS_HYPERV host.

[Alex Deucher]

On Thu, Apr 7, 2022 at 2:35 PM Yongqiang Sun <yongqiang.sun@amd.com> wrote:
>
> Fixes: 8011a76ad370
> ("drm/amdgpu: Add stolen reserved memory for MI25 SRIOV.")

Please put this line between the commit message and your signed-off-by.

>
> driver loading failed on VEGA10 SRIOV VF with linux host due to a wide
> range of stolen reserved vram.
> Since VEGA10 SRIOV VF need to reserve vram for firmware with windows
> Hyper_V host specifically, check hypervisor type to only reserve
> memory for it, and the range of the reserved vram can be limited
> to between 5M-7M area.
>
> Signed-off-by: Yongqiang Sun <yongqiang.sun@amd.com>

Acked-by: Alex Deucher <alexander.deucher@amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
> index a66a0881a934..3e9582c245bb 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
> @@ -25,6 +25,7 @@
>   */
>
>  #include <linux/io-64-nonatomic-lo-hi.h>
> +#include <asm/hypervisor.h>
>
>  #include "amdgpu.h"
>  #include "amdgpu_gmc.h"
> @@ -647,11 +648,11 @@ void amdgpu_gmc_get_vbios_allocations(struct amdgpu_device *adev)
>         case CHIP_VEGA10:
>                 adev->mman.keep_stolen_vga_memory = true;
>                 /*
> -                * VEGA10 SRIOV VF needs some firmware reserved area.
> +                * VEGA10 SRIOV VF with MS_HYPERV host needs some firmware reserved area.
>                  */
> -               if (amdgpu_sriov_vf(adev)) {
> -                       adev->mman.stolen_reserved_offset = 0x100000;
> -                       adev->mman.stolen_reserved_size = 0x600000;
> +               if (amdgpu_sriov_vf(adev) && hypervisor_is_type(X86_HYPER_MS_HYPERV)) {
> +                       adev->mman.stolen_reserved_offset = 0x500000;
> +                       adev->mman.stolen_reserved_size = 0x200000;
>                 }
>                 break;
>         case CHIP_RAVEN:
> --
> 2.25.1
>