drm/amdgpu/gmc8: SRIOV need to program fb location
Subsystems (2)
PATCH v2 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.
BUG: SWDEV-126629
--- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +14 -1
@@ -396,7 +396,9 @@ 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 ) {
@@ -442,6 +444,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): 1500435830-18185-1-git-send-email-Emily.Deng-5C7GfCeVMHo@public.gmane.org
Hi Alex,
Modified the fix, please help to review again.
Best Wishes,
Emily Deng
Quoted 56 lines
-----Original Message-----
From: Emily Deng [mailto:[email protected]]
Sent: Wednesday, July 19, 2017 11:44 AM
To: [email protected]
Cc: Deng, Emily <[email protected]>
Subject: [PATCH v2] 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.v2: No need to stop mc, and update
gmc_v8_0_vram_gtt_locationas well.BUG: SWDEV-126629Signed-off-by Emily Deng <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +0
-0@@ -396,7 +396,9 @@ static int
gmc_v8_0_polaris_mc_load_microcode(struct amdgpu_device *adev)static void gmc_v8_0_vram_gtt_location(structamdgpu_device*adev,drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +3
-1struct 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) { @@ -442,6 +444,17 @@static void
gmc_v8_0_mc_program(struct amdgpu_device *adev)drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +7
-0adev->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-Quoted 1 line
mc.vram_start >> 8));
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +4
-1+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 ); --
Quoted 1 line
1.9.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Deucher, Alexander
Reviewed-by Alex DeucherQuoted 26 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Emily Deng
Sent: Tuesday, July 18, 2017 11:44 PM
To: [email protected]
Cc: Deng, Emily
Subject: [PATCH v2] 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.v2: No need to stop mc, and update
gmc_v8_0_vram_gtt_locationas well.BUG: SWDEV-126629Signed-off-by Emily Deng <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +0
-0
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c static int · line 400
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +1
-1@@ -396,7 +396,9 @@ 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 ;
New line after the stack variables.
Also, if you want the memory layout consistent between bare metal and sr-iov, you should set the base to 0xf400 so when you shift below you'll get the proper byte address (0xf400000000). That said, 0 should work fine as well. Up to you.
With the new line added, feel free to add my:
Quoted 28 lines
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +2
-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 ) {@@ -442,6 +444,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