OSDN Git Service

drm/amdgpu: unity mc base address for arcturus
authorFrank.Min <Frank.Min@amd.com>
Wed, 21 Aug 2019 03:05:04 +0000 (11:05 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 22 Aug 2019 22:15:21 +0000 (17:15 -0500)
arcturus for sriov would use the unified mc base address

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Frank.Min <Frank.Min@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c

index 6d61a53..7ae5f58 100644 (file)
@@ -924,12 +924,12 @@ static void gmc_v9_0_vram_gtt_location(struct amdgpu_device *adev,
                                        struct amdgpu_gmc *mc)
 {
        u64 base = 0;
-       if (!amdgpu_sriov_vf(adev)) {
-               if (adev->asic_type == CHIP_ARCTURUS)
-                       base = mmhub_v9_4_get_fb_location(adev);
-               else
-                       base = mmhub_v1_0_get_fb_location(adev);
-       }
+
+       if (adev->asic_type == CHIP_ARCTURUS)
+               base = mmhub_v9_4_get_fb_location(adev);
+       else if (!amdgpu_sriov_vf(adev))
+               base = mmhub_v1_0_get_fb_location(adev);
+
        /* add the xgmi offset of the physical node */
        base += adev->gmc.xgmi.physical_node_id * adev->gmc.xgmi.node_segment_size;
        amdgpu_gmc_vram_location(adev, mc, base);