aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank.Min <Frank.Min@amd.com>2019-08-21 05:20:34 -0400
committerAlex Deucher <alexander.deucher@amd.com>2019-08-22 18:15:06 -0400
commit81c274c473a25e7e86540cdeaa181421e7daafff (patch)
tree27bcf741979c35a947ae5d546a71528befe4f410
parentc4e1da5e7d5fd32d00628ed0afd190e5cf891567 (diff)
drm/amdgpu: disable agp for sriov
Since agp is not used for sriov, just disable it 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>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c8
-rw-r--r--drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c3
2 files changed, 9 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
index 924d83e711ef..5790db61fa2c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
@@ -220,6 +220,14 @@ void amdgpu_gmc_agp_location(struct amdgpu_device *adev, struct amdgpu_gmc *mc)
220 const uint64_t sixteen_gb_mask = ~(sixteen_gb - 1); 220 const uint64_t sixteen_gb_mask = ~(sixteen_gb - 1);
221 u64 size_af, size_bf; 221 u64 size_af, size_bf;
222 222
223 if (amdgpu_sriov_vf(adev)) {
224 mc->agp_start = 0xffffffff;
225 mc->agp_end = 0x0;
226 mc->agp_size = 0;
227
228 return;
229 }
230
223 if (mc->fb_start > mc->gart_start) { 231 if (mc->fb_start > mc->gart_start) {
224 size_bf = (mc->fb_start & sixteen_gb_mask) - 232 size_bf = (mc->fb_start & sixteen_gb_mask) -
225 ALIGN(mc->gart_end + 1, sixteen_gb); 233 ALIGN(mc->gart_end + 1, sixteen_gb);
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index e5949d7f3b93..6d61a531bb53 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -934,8 +934,7 @@ static void gmc_v9_0_vram_gtt_location(struct amdgpu_device *adev,
934 base += adev->gmc.xgmi.physical_node_id * adev->gmc.xgmi.node_segment_size; 934 base += adev->gmc.xgmi.physical_node_id * adev->gmc.xgmi.node_segment_size;
935 amdgpu_gmc_vram_location(adev, mc, base); 935 amdgpu_gmc_vram_location(adev, mc, base);
936 amdgpu_gmc_gart_location(adev, mc); 936 amdgpu_gmc_gart_location(adev, mc);
937 if (!amdgpu_sriov_vf(adev)) 937 amdgpu_gmc_agp_location(adev, mc);
938 amdgpu_gmc_agp_location(adev, mc);
939 /* base offset of vram pages */ 938 /* base offset of vram pages */
940 adev->vm_manager.vram_base_offset = gfxhub_v1_0_get_mc_fb_offset(adev); 939 adev->vm_manager.vram_base_offset = gfxhub_v1_0_get_mc_fb_offset(adev);
941 940