From: "Christian König" <ckoenig.leichtzumerken@gmail.com>
To: Hamza Mahfooz <hamza.mahfooz@amd.com>, amd-gfx@lists.freedesktop.org
Cc: "Alan Liu" <haoping.liu@amd.com>,
"Lijo Lazar" <lijo.lazar@amd.com>,
dri-devel@lists.freedesktop.org,
"Mario Limonciello" <mario.limonciello@amd.com>,
"David Airlie" <airlied@gmail.com>,
"Shashank Sharma" <shashank.sharma@amd.com>,
"Rodrigo Siqueira" <Rodrigo.Siqueira@amd.com>,
"Aurabindo Pillai" <aurabindo.pillai@amd.com>,
"Qingqing Zhuo" <Qingqing.Zhuo@amd.com>,
"Harry Wentland" <harry.wentland@amd.com>,
"Stylon Wang" <stylon.wang@amd.com>,
"Victor Zhao" <Victor.Zhao@amd.com>,
"Srinivasan Shanmugam" <srinivasan.shanmugam@amd.com>,
"Leo Li" <sunpeng.li@amd.com>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Le Ma" <le.ma@amd.com>, "Hersen Wu" <hersenxs.wu@amd.com>,
"Yifan Zhang" <yifan1.zhang@amd.com>,
"Felix Kuehling" <felix.kuehling@amd.com>,
"Pan, Xinhui" <Xinhui.Pan@amd.com>,
linux-kernel@vger.kernel.org, stable@vger.kernel.org,
"Hawking Zhang" <Hawking.Zhang@amd.com>,
"Daniel Vetter" <daniel@ffwll.ch>,
"Wayne Lin" <wayne.lin@amd.com>,
"Alex Deucher" <alexander.deucher@amd.com>,
"Candice Li" <candice.li@amd.com>, "Lang Yu" <Lang.Yu@amd.com>,
"Christian König" <christian.koenig@amd.com>,
"Luben Tuikov" <luben.tuikov@amd.com>
Subject: Re: [PATCH v2 1/2] drm/amd/display: fix the white screen issue when >= 64GB DRAM
Date: Mon, 11 Sep 2023 10:38:28 +0200 [thread overview]
Message-ID: <2c097494-0854-3769-fb46-0f3fa59e06cb@gmail.com> (raw)
In-Reply-To: <20230908145521.39044-1-hamza.mahfooz@amd.com>
Am 08.09.23 um 16:55 schrieb Hamza Mahfooz:
> From: Yifan Zhang <yifan1.zhang@amd.com>
>
> 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: 81d0bcf99009 ("drm/amdgpu: make display pinning more flexible (v2)")
> Signed-off-by: Yifan Zhang <yifan1.zhang@amd.com>
> Signed-off-by: Hamza Mahfooz <hamza.mahfooz@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com> for the series
as well.
> ---
> v2: use upper_32_bits()/lower_32_bits() and AMDGPU_GPU_PAGE_SHIFT
> ---
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 14 +++++++++-----
> 1 file changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index 1bb1a394f55f..5f14cd9391ca 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -1283,11 +1283,15 @@ static void mmhub_read_system_context(struct amdgpu_device *adev, struct dc_phy_
>
> pt_base = amdgpu_gmc_pd_addr(adev->gart.bo);
>
> - page_table_start.high_part = (u32)(adev->gmc.gart_start >> 44) & 0xF;
> - page_table_start.low_part = (u32)(adev->gmc.gart_start >> 12);
> - page_table_end.high_part = (u32)(adev->gmc.gart_end >> 44) & 0xF;
> - page_table_end.low_part = (u32)(adev->gmc.gart_end >> 12);
> - page_table_base.high_part = upper_32_bits(pt_base) & 0xF;
> + page_table_start.high_part = upper_32_bits(adev->gmc.gart_start >>
> + AMDGPU_GPU_PAGE_SHIFT);
> + page_table_start.low_part = lower_32_bits(adev->gmc.gart_start >>
> + AMDGPU_GPU_PAGE_SHIFT);
> + page_table_end.high_part = upper_32_bits(adev->gmc.gart_end >>
> + AMDGPU_GPU_PAGE_SHIFT);
> + page_table_end.low_part = lower_32_bits(adev->gmc.gart_end >>
> + AMDGPU_GPU_PAGE_SHIFT);
> + page_table_base.high_part = upper_32_bits(pt_base);
> page_table_base.low_part = lower_32_bits(pt_base);
>
> pa_config->system_aperture.start_addr = (uint64_t)logical_addr_low << 18;
prev parent reply other threads:[~2023-09-11 21:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-08 14:55 [PATCH v2 1/2] drm/amd/display: fix the white screen issue when >= 64GB DRAM Hamza Mahfooz
2023-09-08 14:55 ` [PATCH v2 2/2] Revert "drm/amd: Disable S/G for APUs when 64GB or more host memory" Hamza Mahfooz
2023-09-08 15:05 ` Harry Wentland
2023-09-08 15:06 ` [PATCH v2 1/2] drm/amd/display: fix the white screen issue when >= 64GB DRAM Alex Deucher
2023-09-11 8:38 ` Christian König [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2c097494-0854-3769-fb46-0f3fa59e06cb@gmail.com \
--to=ckoenig.leichtzumerken@gmail.com \
--cc=Hawking.Zhang@amd.com \
--cc=Lang.Yu@amd.com \
--cc=Qingqing.Zhuo@amd.com \
--cc=Rodrigo.Siqueira@amd.com \
--cc=Victor.Zhao@amd.com \
--cc=Xinhui.Pan@amd.com \
--cc=airlied@gmail.com \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=aurabindo.pillai@amd.com \
--cc=candice.li@amd.com \
--cc=christian.koenig@amd.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=felix.kuehling@amd.com \
--cc=hamza.mahfooz@amd.com \
--cc=haoping.liu@amd.com \
--cc=harry.wentland@amd.com \
--cc=hersenxs.wu@amd.com \
--cc=le.ma@amd.com \
--cc=lijo.lazar@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luben.tuikov@amd.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mario.limonciello@amd.com \
--cc=shashank.sharma@amd.com \
--cc=srinivasan.shanmugam@amd.com \
--cc=stable@vger.kernel.org \
--cc=stylon.wang@amd.com \
--cc=sunpeng.li@amd.com \
--cc=wayne.lin@amd.com \
--cc=yifan1.zhang@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox