From: Hawking Zhang <Hawking.Zhang@amd.com>
To: amd-gfx@lists.freedesktop.org,
"Felix Kuehling" <Felix.Kuehling@amd.com>,
"Christian König" <christian.koenig@amd.com>,
"Feifei Xu" <Feifei.Xu@amd.com>, "Dennis Li" <Dennis.Li@amd.com>,
"Alex Deucher" <alexander.deucher@amd.com>
Cc: Hawking Zhang <Hawking.Zhang@amd.com>
Subject: [PATCH 09/27] drm/amdgpu: correct ih cg programming for vega10 ih block
Date: Sat, 12 Dec 2020 23:45:42 +0800 [thread overview]
Message-ID: <20201212154600.21618-9-Hawking.Zhang@amd.com> (raw)
In-Reply-To: <20201212154600.21618-1-Hawking.Zhang@amd.com>
vega10/12 and RAVEN don't support soft override
ih_buffer_mem_clk.
Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Acked-by: Felix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: Dennis Li <Dennis.Li@amd.com>
Reviewed-by: Feifei Xu <Feifei.Xu@amd.com>
---
drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/vega10_ih.c b/drivers/gpu/drm/amd/amdgpu/vega10_ih.c
index 629ba46013aa..32c3dd0b6276 100644
--- a/drivers/gpu/drm/amd/amdgpu/vega10_ih.c
+++ b/drivers/gpu/drm/amd/amdgpu/vega10_ih.c
@@ -640,15 +640,11 @@ static void vega10_ih_update_clockgating_state(struct amdgpu_device *adev,
def = data = RREG32_SOC15(OSSSYS, 0, mmIH_CLK_CTRL);
field_val = enable ? 0 : 1;
/**
- * Vega10 does not have IH_RETRY_INT_CAM_MEM_CLK_SOFT_OVERRIDE
- * and IH_BUFFER_MEM_CLK_SOFT_OVERRIDE field.
+ * Vega10/12 and RAVEN don't have IH_BUFFER_MEM_CLK_SOFT_OVERRIDE field.
*/
- if (adev->asic_type > CHIP_VEGA10) {
- data = REG_SET_FIELD(data, IH_CLK_CTRL,
- IH_RETRY_INT_CAM_MEM_CLK_SOFT_OVERRIDE, field_val);
+ if (adev->asic_type == CHIP_RENOIR)
data = REG_SET_FIELD(data, IH_CLK_CTRL,
IH_BUFFER_MEM_CLK_SOFT_OVERRIDE, field_val);
- }
data = REG_SET_FIELD(data, IH_CLK_CTRL,
DBUS_MUX_CLK_SOFT_OVERRIDE, field_val);
--
2.17.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
next prev parent reply other threads:[~2020-12-12 15:46 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-12 15:45 [PATCH 01/27] drm/amdgpu: add amdgpu_ih_regs structure Hawking Zhang
2020-12-12 15:45 ` [PATCH 02/27] drm/amdgpu: add helper to init ih ring regs for vega10 Hawking Zhang
2020-12-12 15:45 ` [PATCH 03/27] drm/amdgpu: add helper to enable an ih ring " Hawking Zhang
2020-12-12 15:45 ` [PATCH 04/27] drm/amdgpu: add helper to toggle ih ring interrupts " Hawking Zhang
2020-12-12 15:45 ` [PATCH 05/27] drm/amdgpu: switch to ih_init_register_offset " Hawking Zhang
2020-12-12 15:45 ` [PATCH 06/27] drm/amdgpu: switch to ih_toggle_interrupts " Hawking Zhang
2020-12-12 15:45 ` [PATCH 07/27] drm/amdgpu: switch to ih_enable_ring " Hawking Zhang
2020-12-12 15:45 ` [PATCH 08/27] drm/amdgpu: use cached ih rb control reg offsets " Hawking Zhang
2020-12-12 15:45 ` Hawking Zhang [this message]
2020-12-12 15:45 ` [PATCH 10/27] drm/amdgpu: add helper to init ih ring regs for navi10 Hawking Zhang
2020-12-12 15:45 ` [PATCH 11/27] drm/amdgpu: add helper to enable an ih ring " Hawking Zhang
2020-12-12 15:45 ` [PATCH 12/27] drm/amdgpu: add helper to toggle ih ring interrupts " Hawking Zhang
2020-12-12 15:45 ` [PATCH 13/27] drm/amdgpu: switch to ih_init_register_offset " Hawking Zhang
2020-12-12 15:45 ` [PATCH 14/27] drm/amdgpu: switch to ih_toggle_interrupts " Hawking Zhang
2020-12-12 15:45 ` [PATCH 15/27] drm/amdgpu: switch to ih_enable_ring " Hawking Zhang
2020-12-12 15:45 ` [PATCH 16/27] drm/amdgpu: use cached ih rb control reg offsets " Hawking Zhang
2020-12-12 15:45 ` [PATCH 17/27] drm/amdgpu: add a helper function to decode iv Hawking Zhang
2020-12-12 15:45 ` [PATCH 18/27] drm/amdgpu: switch to common decode iv helper Hawking Zhang
2020-12-12 15:45 ` [PATCH 19/27] drm/amdgpu: add osssys v4_2 ip headers (v2) Hawking Zhang
2020-12-12 15:45 ` [PATCH 20/27] drm/amdgpu: create vega20 ih blocks Hawking Zhang
2020-12-12 15:45 ` [PATCH 21/27] drm/amdgpu: reroute vmc/utcl2 interrupts to ih ring 1 for arcturus Hawking Zhang
2020-12-12 15:45 ` [PATCH 22/27] drm/amdgpu: switch to vega20 ih block for vega20/arcturus Hawking Zhang
2020-12-12 15:45 ` [PATCH 23/27] drm/amdgpu: retire the vega20 code path from navi10 ih block Hawking Zhang
2020-12-12 15:45 ` [PATCH 24/27] drm/amdgpu: correct ih_chicken programming for vega10/vega20 ih blocks Hawking Zhang
2020-12-12 15:45 ` [PATCH 25/27] drm/amdgpu: drop arcturus IH_CHICKEN programming from vega10 ih block Hawking Zhang
2020-12-12 15:45 ` [PATCH 26/27] drm/amdgpu: drop ih reroute function from psp v11 Hawking Zhang
2020-12-14 9:07 ` Christian König
2020-12-12 15:46 ` [PATCH 27/27] drm/amdgpu: don't create ih ring 1 and ring 2 for APU Hawking Zhang
2020-12-15 3:04 ` [PATCH 01/27] drm/amdgpu: add amdgpu_ih_regs structure Felix Kuehling
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=20201212154600.21618-9-Hawking.Zhang@amd.com \
--to=hawking.zhang@amd.com \
--cc=Dennis.Li@amd.com \
--cc=Feifei.Xu@amd.com \
--cc=Felix.Kuehling@amd.com \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=christian.koenig@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.