drm/radeon/kms: fix formatting of vram and gtt info
Subsystems (2)
PATCH 1/1 drm/radeon/kms: fix formatting of vram and gtt info
print the full 64 bit values.
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/radeon/radeon_device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/radeon_device.c +2 -2
@@ -291,7 +291,7 @@ void radeon_vram_location(struct radeon_device *rdev, struct radeon_mc *mc, u64 mc->mc_vram_size = mc->aper_size; } mc->vram_end = mc->vram_start + mc->mc_vram_size -1 ; -dev_info (rdev->dev,"VRAM: %lluM 0x%08llX - 0x%08llX (%lluM used)\n" , +dev_info (rdev->dev,"VRAM: %lluM 0x%016llX - 0x%016llX (%lluM used)\n" , mc->mc_vram_size >>20 , mc->vram_start, mc->vram_end, mc->real_vram_size >>20 ); }
@@ -328,7 +328,7 @@ void radeon_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc) mc->gtt_start = (mc->vram_end +1 + mc->gtt_base_align) & ~mc->gtt_base_align; } mc->gtt_end = mc->gtt_start + mc->gtt_size -1 ; -dev_info (rdev->dev,"GTT: %lluM 0x%08llX - 0x%08llX\n" , +dev_info (rdev->dev,"GTT: %lluM 0x%016llX - 0x%016llX\n" , mc->gtt_size >>20 , mc->gtt_start, mc->gtt_end); }
Signature · 1 line
1.7.1.1
PATCH 1/1 drm/radeon/kms: fix vram base calculation on rs780/rs880
Avoid overflowing a 32 bit value.
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/radeon/r600.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/r600.c +4 -2
@@ -1198,8 +1198,10 @@ static void r600_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc mc->vram_end, mc->real_vram_size >> 20); }else {u64 base =0 ; -if (rdev->flags &RADEON_IS_IGP ) - base = (RREG32 (MC_VM_FB_LOCATION ) &0xFFFF ) <<24 ; +if (rdev->flags &RADEON_IS_IGP ) { + base =RREG32 (MC_VM_FB_LOCATION ) &0xFFFF ; + base <<=24 ; + }radeon_vram_location (rdev, &rdev->mc, base); rdev->mc.gtt_base_align =0 ;radeon_gtt_location (rdev, mc);
Signature · 1 line
1.7.1.1
PATCH 1/1 drm/radeon/kms: fix vram start calculation on ontario
In reply to Alex DeucherSigned-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/radeon/evergreen.c | 6 ++++++ drivers/gpu/drm/radeon/evergreend.h | 1 + drivers/gpu/drm/radeon/rv770.c | 11 +++-------- 3 files changed, 10 insertions(+), 8 deletions(-)
drivers/gpu/drm/radeon/evergreen.c +6 -0
@@ -1146,6 +1146,12 @@ static void evergreen_mc_program(struct radeon_device *rdev) rdev->mc.vram_end >> 12); }WREG32 (MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR ,0 ); +if (rdev->flags &RADEON_IS_IGP ) { + tmp =RREG32 (MC_FUS_VM_FB_OFFSET ) &0x000FFFFF ; + tmp |= ((rdev->mc.vram_end >>20 ) &0xF ) <<24 ; + tmp |= ((rdev->mc.vram_start >>20 ) &0xF ) <<20 ; +WREG32 (MC_FUS_VM_FB_OFFSET , tmp); + } tmp = ((rdev->mc.vram_end >>24 ) &0xFFFF ) <<16 ; tmp |= ((rdev->mc.vram_start >>24 ) &0xFFFF );WREG32 (MC_VM_FB_LOCATION , tmp);
drivers/gpu/drm/radeon/evergreend.h +1 -0
@@ -202,6 +202,7 @@#define MC_VM_AGP_BOT 0x202C#define MC_VM_AGP_BASE 0x2030#define MC_VM_FB_LOCATION 0x2024 +#define MC_FUS_VM_FB_OFFSET 0x2898#define MC_VM_MB_L1_TLB0_CNTL 0x2234#define MC_VM_MB_L1_TLB1_CNTL 0x2238#define MC_VM_MB_L1_TLB2_CNTL 0x223C
drivers/gpu/drm/radeon/rv770.c +3 -8
@@ -271,12 +271,6 @@ static void rv770_mc_program(struct radeon_device *rdev) rdev->mc.vram_end >> 12); }WREG32 (MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR ,0 ); -if (rdev->flags &RADEON_IS_IGP ) { - tmp =RREG32 (MC_FUS_VM_FB_OFFSET ) &0x000FFFFF ; - tmp |= ((rdev->mc.vram_end >>20 ) &0xF ) <<24 ; - tmp |= ((rdev->mc.vram_start >>20 ) &0xF ) <<20 ; -WREG32 (MC_FUS_VM_FB_OFFSET , tmp); - } tmp = ((rdev->mc.vram_end >>24 ) &0xFFFF ) <<16 ; tmp |= ((rdev->mc.vram_start >>24 ) &0xFFFF );WREG32 (MC_VM_FB_LOCATION , tmp);
@@ -1076,8 +1070,9 @@ void r700_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc) }else {u64 base =0 ;if (rdev->flags &RADEON_IS_IGP ) { - base = (RREG32 (MC_VM_FB_LOCATION ) &0xFFFF ) <<24 ; - base |=RREG32 (MC_FUS_VM_FB_OFFSET ) &0x00F00000 ; + base =RREG32 (MC_VM_FB_LOCATION ) &0xFFFF ; + base <<=24 ; + base |= (u64)(RREG32 (MC_FUS_VM_FB_OFFSET ) &0x00F00000 ); }radeon_vram_location (rdev, &rdev->mc, base); rdev->mc.gtt_base_align =0 ;
Signature · 1 line
1.7.1.1
PATCH 1/1 drm/radeon/kms: fix vram start calculation on ontario (v2)
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/radeon/evergreen.c | 6 ++++++ drivers/gpu/drm/radeon/evergreend.h | 1 + drivers/gpu/drm/radeon/rv770.c | 13 +------------ drivers/gpu/drm/radeon/rv770d.h | 1 - 4 files changed, 8 insertions(+), 13 deletions(-)
drivers/gpu/drm/radeon/evergreen.c +6 -0
@@ -1080,6 +1080,12 @@ static void evergreen_mc_program(struct radeon_device *rdev) rdev->mc.vram_end >> 12); }WREG32 (MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR ,0 ); +if (rdev->flags &RADEON_IS_IGP ) { + tmp =RREG32 (MC_FUS_VM_FB_OFFSET ) &0x000FFFFF ; + tmp |= ((rdev->mc.vram_end >>20 ) &0xF ) <<24 ; + tmp |= ((rdev->mc.vram_start >>20 ) &0xF ) <<20 ; +WREG32 (MC_FUS_VM_FB_OFFSET , tmp); + } tmp = ((rdev->mc.vram_end >>24 ) &0xFFFF ) <<16 ; tmp |= ((rdev->mc.vram_start >>24 ) &0xFFFF );WREG32 (MC_VM_FB_LOCATION , tmp);
drivers/gpu/drm/radeon/evergreend.h +1 -0
@@ -203,6 +203,7 @@#define MC_VM_AGP_BOT 0x202C#define MC_VM_AGP_BASE 0x2030#define MC_VM_FB_LOCATION 0x2024 +#define MC_FUS_VM_FB_OFFSET 0x2898#define MC_VM_MB_L1_TLB0_CNTL 0x2234#define MC_VM_MB_L1_TLB1_CNTL 0x2238#define MC_VM_MB_L1_TLB2_CNTL 0x223C
drivers/gpu/drm/radeon/rv770.c +1 -12
@@ -237,12 +237,6 @@ static void rv770_mc_program(struct radeon_device *rdev) rdev->mc.vram_end >> 12); }WREG32 (MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR ,0 ); -if (rdev->flags &RADEON_IS_IGP ) { - tmp =RREG32 (MC_FUS_VM_FB_OFFSET ) &0x000FFFFF ; - tmp |= ((rdev->mc.vram_end >>20 ) &0xF ) <<24 ; - tmp |= ((rdev->mc.vram_start >>20 ) &0xF ) <<20 ; -WREG32 (MC_FUS_VM_FB_OFFSET , tmp); - } tmp = ((rdev->mc.vram_end >>24 ) &0xFFFF ) <<16 ; tmp |= ((rdev->mc.vram_start >>24 ) &0xFFFF );WREG32 (MC_VM_FB_LOCATION , tmp);
@@ -1040,12 +1034,7 @@ void r700_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc) mc->mc_vram_size >>20 , mc->vram_start, mc->vram_end, mc->real_vram_size >> 20); }else { -u64 base =0 ; -if (rdev->flags &RADEON_IS_IGP ) { - base = (RREG32 (MC_VM_FB_LOCATION ) &0xFFFF ) <<24 ; - base |=RREG32 (MC_FUS_VM_FB_OFFSET ) &0x00F00000 ; - } -radeon_vram_location (rdev, &rdev->mc, base); +radeon_vram_location (rdev, &rdev->mc,0 ); rdev->mc.gtt_base_align =0 ;radeon_gtt_location (rdev, mc); }
drivers/gpu/drm/radeon/rv770d.h +0 -1
@@ -158,7 +158,6 @@#define MC_VM_AGP_BOT 0x202C#define MC_VM_AGP_BASE 0x2030#define MC_VM_FB_LOCATION 0x2024 -#define MC_FUS_VM_FB_OFFSET 0x2898#define MC_VM_MB_L1_TLB0_CNTL 0x2234#define MC_VM_MB_L1_TLB1_CNTL 0x2238#define MC_VM_MB_L1_TLB2_CNTL 0x223C
Signature · 1 line
1.7.2.3