From: Felix Kuehling <felix.kuehling@amd.com>
To: Alex Deucher <alexdeucher@gmail.com>,
Alex Deucher <alexander.deucher@amd.com>
Cc: amd-gfx@lists.freedesktop.org
Subject: Re: [PATCH 1/7] Revert "drm/amdgpu: Use generic hdp flush function"
Date: Wed, 7 May 2025 11:27:40 -0400 [thread overview]
Message-ID: <2227b521-3f4e-41de-90ef-fe3d2d031c67@amd.com> (raw)
In-Reply-To: <CADnq5_M3k7RmOowRW+GDh9Kn9MrTXNv7Vc4b=Pd0UG0w22Qr5A@mail.gmail.com>
On 2025-05-06 11:17, Alex Deucher wrote:
> Ping on this series? This fixes a regression.
>
> Alex
>
> On Mon, May 5, 2025 at 9:05 AM Alex Deucher <alexander.deucher@amd.com> wrote:
>> This reverts commit 18a878fd8aef0ec21648a3782f55a79790cd4073.
>>
>> Revert this temporarily to make it easier to fix a regression
>> in the HDP handling.
>>
>> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
The series is
Reviewed-by: Felix Kuehling <felix.kuehling@amd.com>
>> ---
>> drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c | 21 ---------------------
>> drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h | 2 --
>> drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 13 ++++++++++++-
>> drivers/gpu/drm/amd/amdgpu/hdp_v5_0.c | 13 ++++++++++++-
>> drivers/gpu/drm/amd/amdgpu/hdp_v6_0.c | 13 ++++++++++++-
>> drivers/gpu/drm/amd/amdgpu/hdp_v7_0.c | 13 ++++++++++++-
>> 6 files changed, 48 insertions(+), 27 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c
>> index 7fd8f09c28e66..b6cf801939aa5 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c
>> @@ -22,7 +22,6 @@
>> */
>> #include "amdgpu.h"
>> #include "amdgpu_ras.h"
>> -#include <uapi/linux/kfd_ioctl.h>
>>
>> int amdgpu_hdp_ras_sw_init(struct amdgpu_device *adev)
>> {
>> @@ -47,23 +46,3 @@ int amdgpu_hdp_ras_sw_init(struct amdgpu_device *adev)
>> /* hdp ras follows amdgpu_ras_block_late_init_default for late init */
>> return 0;
>> }
>> -
>> -void amdgpu_hdp_generic_flush(struct amdgpu_device *adev,
>> - struct amdgpu_ring *ring)
>> -{
>> - if (!ring || !ring->funcs->emit_wreg) {
>> - WREG32((adev->rmmio_remap.reg_offset +
>> - KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL) >>
>> - 2,
>> - 0);
>> - RREG32((adev->rmmio_remap.reg_offset +
>> - KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL) >>
>> - 2);
>> - } else {
>> - amdgpu_ring_emit_wreg(ring,
>> - (adev->rmmio_remap.reg_offset +
>> - KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL) >>
>> - 2,
>> - 0);
>> - }
>> -}
>> \ No newline at end of file
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h
>> index 4cfd932b7e91e..7b8a6152dc8d9 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h
>> @@ -44,6 +44,4 @@ struct amdgpu_hdp {
>> };
>>
>> int amdgpu_hdp_ras_sw_init(struct amdgpu_device *adev);
>> -void amdgpu_hdp_generic_flush(struct amdgpu_device *adev,
>> - struct amdgpu_ring *ring);
>> #endif /* __AMDGPU_HDP_H__ */
>> diff --git a/drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c b/drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c
>> index e6c0d86d34865..f1dc13b3ab38e 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c
>> @@ -36,6 +36,17 @@
>> #define HDP_MEM_POWER_CTRL__RC_MEM_POWER_LS_EN_MASK 0x00020000L
>> #define mmHDP_MEM_POWER_CTRL_BASE_IDX 0
>>
>> +static void hdp_v4_0_flush_hdp(struct amdgpu_device *adev,
>> + struct amdgpu_ring *ring)
>> +{
>> + if (!ring || !ring->funcs->emit_wreg) {
>> + WREG32((adev->rmmio_remap.reg_offset + KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL) >> 2, 0);
>> + RREG32((adev->rmmio_remap.reg_offset + KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL) >> 2);
>> + } else {
>> + amdgpu_ring_emit_wreg(ring, (adev->rmmio_remap.reg_offset + KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL) >> 2, 0);
>> + }
>> +}
>> +
>> static void hdp_v4_0_invalidate_hdp(struct amdgpu_device *adev,
>> struct amdgpu_ring *ring)
>> {
>> @@ -169,7 +180,7 @@ struct amdgpu_hdp_ras hdp_v4_0_ras = {
>> };
>>
>> const struct amdgpu_hdp_funcs hdp_v4_0_funcs = {
>> - .flush_hdp = amdgpu_hdp_generic_flush,
>> + .flush_hdp = hdp_v4_0_flush_hdp,
>> .invalidate_hdp = hdp_v4_0_invalidate_hdp,
>> .update_clock_gating = hdp_v4_0_update_clock_gating,
>> .get_clock_gating_state = hdp_v4_0_get_clockgating_state,
>> diff --git a/drivers/gpu/drm/amd/amdgpu/hdp_v5_0.c b/drivers/gpu/drm/amd/amdgpu/hdp_v5_0.c
>> index 8bc001dc9f631..43195c0797480 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/hdp_v5_0.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/hdp_v5_0.c
>> @@ -27,6 +27,17 @@
>> #include "hdp/hdp_5_0_0_sh_mask.h"
>> #include <uapi/linux/kfd_ioctl.h>
>>
>> +static void hdp_v5_0_flush_hdp(struct amdgpu_device *adev,
>> + struct amdgpu_ring *ring)
>> +{
>> + if (!ring || !ring->funcs->emit_wreg) {
>> + WREG32((adev->rmmio_remap.reg_offset + KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL) >> 2, 0);
>> + RREG32((adev->rmmio_remap.reg_offset + KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL) >> 2);
>> + } else {
>> + amdgpu_ring_emit_wreg(ring, (adev->rmmio_remap.reg_offset + KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL) >> 2, 0);
>> + }
>> +}
>> +
>> static void hdp_v5_0_invalidate_hdp(struct amdgpu_device *adev,
>> struct amdgpu_ring *ring)
>> {
>> @@ -206,7 +217,7 @@ static void hdp_v5_0_init_registers(struct amdgpu_device *adev)
>> }
>>
>> const struct amdgpu_hdp_funcs hdp_v5_0_funcs = {
>> - .flush_hdp = amdgpu_hdp_generic_flush,
>> + .flush_hdp = hdp_v5_0_flush_hdp,
>> .invalidate_hdp = hdp_v5_0_invalidate_hdp,
>> .update_clock_gating = hdp_v5_0_update_clock_gating,
>> .get_clock_gating_state = hdp_v5_0_get_clockgating_state,
>> diff --git a/drivers/gpu/drm/amd/amdgpu/hdp_v6_0.c b/drivers/gpu/drm/amd/amdgpu/hdp_v6_0.c
>> index ec20daf4272c5..a88d25a06c29b 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/hdp_v6_0.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/hdp_v6_0.c
>> @@ -30,6 +30,17 @@
>> #define regHDP_CLK_CNTL_V6_1 0xd5
>> #define regHDP_CLK_CNTL_V6_1_BASE_IDX 0
>>
>> +static void hdp_v6_0_flush_hdp(struct amdgpu_device *adev,
>> + struct amdgpu_ring *ring)
>> +{
>> + if (!ring || !ring->funcs->emit_wreg) {
>> + WREG32((adev->rmmio_remap.reg_offset + KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL) >> 2, 0);
>> + RREG32((adev->rmmio_remap.reg_offset + KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL) >> 2);
>> + } else {
>> + amdgpu_ring_emit_wreg(ring, (adev->rmmio_remap.reg_offset + KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL) >> 2, 0);
>> + }
>> +}
>> +
>> static void hdp_v6_0_update_clock_gating(struct amdgpu_device *adev,
>> bool enable)
>> {
>> @@ -138,7 +149,7 @@ static void hdp_v6_0_get_clockgating_state(struct amdgpu_device *adev,
>> }
>>
>> const struct amdgpu_hdp_funcs hdp_v6_0_funcs = {
>> - .flush_hdp = amdgpu_hdp_generic_flush,
>> + .flush_hdp = hdp_v6_0_flush_hdp,
>> .update_clock_gating = hdp_v6_0_update_clock_gating,
>> .get_clock_gating_state = hdp_v6_0_get_clockgating_state,
>> };
>> diff --git a/drivers/gpu/drm/amd/amdgpu/hdp_v7_0.c b/drivers/gpu/drm/amd/amdgpu/hdp_v7_0.c
>> index ed1debc035073..49f7eb4fbd117 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/hdp_v7_0.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/hdp_v7_0.c
>> @@ -27,6 +27,17 @@
>> #include "hdp/hdp_7_0_0_sh_mask.h"
>> #include <uapi/linux/kfd_ioctl.h>
>>
>> +static void hdp_v7_0_flush_hdp(struct amdgpu_device *adev,
>> + struct amdgpu_ring *ring)
>> +{
>> + if (!ring || !ring->funcs->emit_wreg) {
>> + WREG32((adev->rmmio_remap.reg_offset + KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL) >> 2, 0);
>> + RREG32((adev->rmmio_remap.reg_offset + KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL) >> 2);
>> + } else {
>> + amdgpu_ring_emit_wreg(ring, (adev->rmmio_remap.reg_offset + KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL) >> 2, 0);
>> + }
>> +}
>> +
>> static void hdp_v7_0_update_clock_gating(struct amdgpu_device *adev,
>> bool enable)
>> {
>> @@ -126,7 +137,7 @@ static void hdp_v7_0_get_clockgating_state(struct amdgpu_device *adev,
>> }
>>
>> const struct amdgpu_hdp_funcs hdp_v7_0_funcs = {
>> - .flush_hdp = amdgpu_hdp_generic_flush,
>> + .flush_hdp = hdp_v7_0_flush_hdp,
>> .update_clock_gating = hdp_v7_0_update_clock_gating,
>> .get_clock_gating_state = hdp_v7_0_get_clockgating_state,
>> };
>> --
>> 2.49.0
>>
next prev parent reply other threads:[~2025-05-07 15:27 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-05 13:04 [PATCH 1/7] Revert "drm/amdgpu: Use generic hdp flush function" Alex Deucher
2025-05-05 13:04 ` [PATCH 2/7] drm/amdgpu/hdp4: use memcfg register to post the write for HDP flush Alex Deucher
2025-05-05 13:04 ` [PATCH 3/7] drm/amdgpu/hdp5: " Alex Deucher
2025-05-05 13:04 ` [PATCH 4/7] drm/amdgpu/hdp5.2: " Alex Deucher
2025-05-05 13:04 ` [PATCH 5/7] drm/amdgpu/hdp6: " Alex Deucher
2025-05-05 13:04 ` [PATCH 6/7] drm/amdgpu/hdp7: " Alex Deucher
2025-05-05 13:04 ` [PATCH 7/7] Reapply: drm/amdgpu: Use generic hdp flush function Alex Deucher
2025-05-06 15:17 ` [PATCH 1/7] Revert "drm/amdgpu: Use generic hdp flush function" Alex Deucher
2025-05-07 15:13 ` Alex Deucher
2025-05-07 16:43 ` Lazar, Lijo
2025-05-07 16:49 ` Alex Deucher
2025-05-07 15:27 ` Felix Kuehling [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-05-07 15:27 Alex Deucher
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=2227b521-3f4e-41de-90ef-fe3d2d031c67@amd.com \
--to=felix.kuehling@amd.com \
--cc=alexander.deucher@amd.com \
--cc=alexdeucher@gmail.com \
--cc=amd-gfx@lists.freedesktop.org \
/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