Skip to content

Commit ef06418

Browse files
yifancomalexdeucher
authored andcommitted
drm/amd/display: fix the white screen issue when >= 64GB DRAM
Dropping bit 31:4 of page table base is wrong, it makes page table base points to wrong address if phys addr is beyond 64GB; dropping page_table_start/end bit 31:4 is unnecessary since dcn20_vmid_setup will do that. Also, while we are at it, cleanup the assignments using upper_32_bits()/lower_32_bits() and AMDGPU_GPU_PAGE_SHIFT. Cc: stable@vger.kernel.org Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2354 Fixes: 81d0bcf ("drm/amdgpu: make display pinning more flexible (v2)") Acked-by: Harry Wentland <harry.wentland@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Yifan Zhang <yifan1.zhang@amd.com> Co-developed-by: Hamza Mahfooz <hamza.mahfooz@amd.com> Signed-off-by: Hamza Mahfooz <hamza.mahfooz@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent fc6efed commit ef06418

1 file changed

Lines changed: 9 additions & 5 deletions

File tree

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1274,11 +1274,15 @@ static void mmhub_read_system_context(struct amdgpu_device *adev, struct dc_phy_
12741274

12751275
pt_base = amdgpu_gmc_pd_addr(adev->gart.bo);
12761276

1277-
page_table_start.high_part = (u32)(adev->gmc.gart_start >> 44) & 0xF;
1278-
page_table_start.low_part = (u32)(adev->gmc.gart_start >> 12);
1279-
page_table_end.high_part = (u32)(adev->gmc.gart_end >> 44) & 0xF;
1280-
page_table_end.low_part = (u32)(adev->gmc.gart_end >> 12);
1281-
page_table_base.high_part = upper_32_bits(pt_base) & 0xF;
1277+
page_table_start.high_part = upper_32_bits(adev->gmc.gart_start >>
1278+
AMDGPU_GPU_PAGE_SHIFT);
1279+
page_table_start.low_part = lower_32_bits(adev->gmc.gart_start >>
1280+
AMDGPU_GPU_PAGE_SHIFT);
1281+
page_table_end.high_part = upper_32_bits(adev->gmc.gart_end >>
1282+
AMDGPU_GPU_PAGE_SHIFT);
1283+
page_table_end.low_part = lower_32_bits(adev->gmc.gart_end >>
1284+
AMDGPU_GPU_PAGE_SHIFT);
1285+
page_table_base.high_part = upper_32_bits(pt_base);
12821286
page_table_base.low_part = lower_32_bits(pt_base);
12831287

12841288
pa_config->system_aperture.start_addr = (uint64_t)logical_addr_low << 18;

0 commit comments

Comments
 (0)