lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 303/879] drm/amd/amdgpu: Fix asm/hypervisor.h build error.
    Date
    From: Yongqiang Sun <yongqiang.sun@amd.com>

    [ Upstream commit d9e50239a9611b9a1759e007e9a810c8d178da28 ]

    Add CONFIG_X86 check to fix the build error.

    Fixes: 49aa98ca30cd18 ("drm/amd/amdgpu: Only reserve vram for firmware with vega9 MS_HYPERV host.")
    Reported-by: kernel test robot <lkp@intel.com>
    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 4 ++++
    1 file changed, 4 insertions(+)

    diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
    index 3e9582c245bb..88b852b3a2cb 100644
    --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
    +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
    @@ -25,7 +25,9 @@
    */

    #include <linux/io-64-nonatomic-lo-hi.h>
    +#ifdef CONFIG_X86
    #include <asm/hypervisor.h>
    +#endif

    #include "amdgpu.h"
    #include "amdgpu_gmc.h"
    @@ -650,10 +652,12 @@ void amdgpu_gmc_get_vbios_allocations(struct amdgpu_device *adev)
    /*
    * VEGA10 SRIOV VF with MS_HYPERV host needs some firmware reserved area.
    */
    +#ifdef CONFIG_X86
    if (amdgpu_sriov_vf(adev) && hypervisor_is_type(X86_HYPER_MS_HYPERV)) {
    adev->mman.stolen_reserved_offset = 0x500000;
    adev->mman.stolen_reserved_size = 0x200000;
    }
    +#endif
    break;
    case CHIP_RAVEN:
    case CHIP_RENOIR:
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-08 00:28    [W:2.961 / U:0.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site