drm/amdgpu/gmc8: SRIOV need to program fb location
Subsystems (2)
PATCH v3 1/1 drm/amdgpu/gmc8: SRIOV need to program fb location
SRIOV won't do vbios post in guest OS, and the mmMC_VM_FB_LOCATION is pf and vf copy, so still need to program fb location for SRIOV.
v2: No need to stop mc, and update gmc_v8_0_vram_gtt_location as well.
v3: New line after the stack variables
BUG: SWDEV-126629
--- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +15 -1
@@ -397,7 +397,10 @@ static int gmc_v8_0_polaris_mc_load_microcode(struct amdgpu_device *adev)static void gmc_v8_0_vram_gtt_location (struct amdgpu_device *adev,struct amdgpu_mc *mc) { -u64 base =RREG32 (mmMC_VM_FB_LOCATION) &0xFFFF ; +u64 base =0 ; + +if (!amdgpu_sriov_vf (adev)) + base =RREG32 (mmMC_VM_FB_LOCATION) &0xFFFF ; base <<=24 ;if (mc->mc_vram_size >0xFFC0000000ULL ) {
@@ -443,6 +446,17 @@ static void gmc_v8_0_mc_program(struct amdgpu_device *adev) adev->mc.vram_end >> 12);WREG32 (mmMC_VM_SYSTEM_APERTURE_DEFAULT_ADDR, adev->vram_scratch.gpu_addr >>12 ); + +if (amdgpu_sriov_vf (adev)) { + tmp = ((adev->mc.vram_end >>24 ) &0xFFFF ) <<16 ; + tmp |= ((adev->mc.vram_start >>24 ) &0xFFFF ); +WREG32 (mmMC_VM_FB_LOCATION, tmp); +/* XXX double check these! */ +WREG32 (mmHDP_NONSURFACE_BASE, (adev->mc.vram_start >>8 )); +WREG32 (mmHDP_NONSURFACE_INFO, (2 <<7 ) | (1 <<30 )); +WREG32 (mmHDP_NONSURFACE_SIZE,0x3FFFFFFF ); + } +WREG32 (mmMC_VM_AGP_BASE,0 );WREG32 (mmMC_VM_AGP_TOP,0x0FFFFFFF );WREG32 (mmMC_VM_AGP_BOT,0x0FFFFFFF );
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1500517268-29094-1-git-send-email-Emily.Deng-5C7GfCeVMHo@public.gmane.org
Deucher, Alexander
Reviewed-by Alex DeucherQuoted 11 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Emily Deng
Sent: Wednesday, July 19, 2017 10:21 PM
To: [email protected]
Cc: Deng, Emily
Subject: [PATCH v3] drm/amdgpu/gmc8: SRIOV need to program fb locationSRIOV won't do vbios post in guest OS, and the
mmMC_VM_FB_LOCATIONis pf and vf copy, so still need to program fb location for SRIOV.
Quoted 7 lines
v2: No need to stop mc, and update
gmc_v8_0_vram_gtt_locationas well.v3: New line after the stack variables
BUG: SWDEV-126629Signed-off-by Emily Deng <[email protected]>
Quoted 45 lines
--- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +4
-1@@ -397,7 +397,10 @@ static int gmc_v8_0_polaris_mc_load_microcode(struct amdgpu_device *adev) static void gmc_v8_0_vram_gtt_location(struct amdgpu_device *adev,struct amdgpu_mc *mc) { -u64 base =RREG32 (mmMC_VM_FB_LOCATION) &0xFFFF ; +u64 base =0 ; + +if (!amdgpu_sriov_vf (adev)) + base =RREG32 (mmMC_VM_FB_LOCATION) &0xFFFF ; base <<=24 ;drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +11
-0if (mc->mc_vram_size >0xFFC0000000ULL ) {@@ -443,6 +446,17 @@ static void gmc_v8_0_mc_program(struct amdgpu_device *adev) adev->mc.vram_end >> 12);WREG32 (mmMC_VM_SYSTEM_APERTURE_DEFAULT_ADDR, adev->vram_scratch.gpu_addr >>12 ); + +if (amdgpu_sriov_vf (adev)) { + tmp = ((adev->mc.vram_end >>24 ) &0xFFFF ) <<16 ; + tmp |= ((adev->mc.vram_start >>24 ) &0xFFFF ); +WREG32 (mmMC_VM_FB_LOCATION, tmp); +/* XXX double check these! */ +WREG32 (mmHDP_NONSURFACE_BASE, (adev- >mc.vram_start >> 8)); +WREG32 (mmHDP_NONSURFACE_INFO, (2 <<7 ) | (1 <<30 )); +WREG32 (mmHDP_NONSURFACE_SIZE,0x3FFFFFFF ); + } +WREG32 (mmMC_VM_AGP_BASE,0 );drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +0
-1WREG32 (mmMC_VM_AGP_TOP,0x0FFFFFFF );WREG32 (mmMC_VM_AGP_BOT,0x0FFFFFFF ); --1.9.1
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx