OSDN Git Service

drm/amd/amdgpu: Only reserve vram for firmware with vega9 MS_HYPERV host.
authorYongqiang Sun <yongqiang.sun@amd.com>
Wed, 30 Mar 2022 14:48:19 +0000 (10:48 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 7 Apr 2022 20:38:53 +0000 (16:38 -0400)
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.

Fixes: faad5ccac1eaae ("drm/amdgpu: Add stolen reserved memory for MI25 SRIOV.")
Signed-off-by: Yongqiang Sun <yongqiang.sun@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c

index a66a088..3e9582c 100644 (file)
@@ -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: