* [PATCH] drm/amdgpu: Add gfx doorbell setting for Vangogh
@ 2020-11-18 12:09 Jinzhou Su
2020-11-19 10:36 ` Huang Rui
0 siblings, 1 reply; 2+ messages in thread
From: Jinzhou Su @ 2020-11-18 12:09 UTC (permalink / raw)
To: amd-gfx; +Cc: Jinzhou Su, prakash.kamliya, ray.huang
Using KIQ to map GFX queues instead of MMIO for gfx async ring,
add missing doorbell range setting.
Signed-off-by: Jinzhou.Su <Jinzhou.Su@amd.com>
---
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
index a6d03931f7fa..9b4e5d53432f 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
@@ -5995,17 +5995,19 @@ static void gfx_v10_0_cp_gfx_set_doorbell(struct amdgpu_device *adev,
{
u32 tmp;
- tmp = RREG32_SOC15(GC, 0, mmCP_RB_DOORBELL_CONTROL);
- if (ring->use_doorbell) {
- tmp = REG_SET_FIELD(tmp, CP_RB_DOORBELL_CONTROL,
- DOORBELL_OFFSET, ring->doorbell_index);
- tmp = REG_SET_FIELD(tmp, CP_RB_DOORBELL_CONTROL,
- DOORBELL_EN, 1);
- } else {
- tmp = REG_SET_FIELD(tmp, CP_RB_DOORBELL_CONTROL,
- DOORBELL_EN, 0);
+ if (!amdgpu_async_gfx_ring) {
+ tmp = RREG32_SOC15(GC, 0, mmCP_RB_DOORBELL_CONTROL);
+ if (ring->use_doorbell) {
+ tmp = REG_SET_FIELD(tmp, CP_RB_DOORBELL_CONTROL,
+ DOORBELL_OFFSET, ring->doorbell_index);
+ tmp = REG_SET_FIELD(tmp, CP_RB_DOORBELL_CONTROL,
+ DOORBELL_EN, 1);
+ } else {
+ tmp = REG_SET_FIELD(tmp, CP_RB_DOORBELL_CONTROL,
+ DOORBELL_EN, 0);
+ }
+ WREG32_SOC15(GC, 0, mmCP_RB_DOORBELL_CONTROL, tmp);
}
- WREG32_SOC15(GC, 0, mmCP_RB_DOORBELL_CONTROL, tmp);
switch (adev->asic_type) {
case CHIP_SIENNA_CICHLID:
case CHIP_NAVY_FLOUNDER:
@@ -6349,6 +6351,8 @@ static int gfx_v10_0_gfx_mqd_init(struct amdgpu_ring *ring)
DOORBELL_EN, 0);
mqd->cp_rb_doorbell_control = tmp;
+ /* set doorbell range */
+ gfx_v10_0_cp_gfx_set_doorbell(adev, ring);
/* reset read and write pointers, similar to CP_RB0_WPTR/_RPTR */
ring->wptr = 0;
mqd->cp_gfx_hqd_rptr = RREG32_SOC15(GC, 0, mmCP_GFX_HQD_RPTR);
--
2.17.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] drm/amdgpu: Add gfx doorbell setting for Vangogh
2020-11-18 12:09 [PATCH] drm/amdgpu: Add gfx doorbell setting for Vangogh Jinzhou Su
@ 2020-11-19 10:36 ` Huang Rui
0 siblings, 0 replies; 2+ messages in thread
From: Huang Rui @ 2020-11-19 10:36 UTC (permalink / raw)
To: Su, Jinzhou (Joe); +Cc: Kamliya, Prakash, amd-gfx@lists.freedesktop.org
On Wed, Nov 18, 2020 at 08:09:05PM +0800, Su, Jinzhou (Joe) wrote:
> Using KIQ to map GFX queues instead of MMIO for gfx async ring,
> add missing doorbell range setting.
>
> Signed-off-by: Jinzhou.Su <Jinzhou.Su@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 24 ++++++++++++++----------
> 1 file changed, 14 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> index a6d03931f7fa..9b4e5d53432f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> @@ -5995,17 +5995,19 @@ static void gfx_v10_0_cp_gfx_set_doorbell(struct amdgpu_device *adev,
> {
> u32 tmp;
>
> - tmp = RREG32_SOC15(GC, 0, mmCP_RB_DOORBELL_CONTROL);
> - if (ring->use_doorbell) {
> - tmp = REG_SET_FIELD(tmp, CP_RB_DOORBELL_CONTROL,
> - DOORBELL_OFFSET, ring->doorbell_index);
> - tmp = REG_SET_FIELD(tmp, CP_RB_DOORBELL_CONTROL,
> - DOORBELL_EN, 1);
> - } else {
> - tmp = REG_SET_FIELD(tmp, CP_RB_DOORBELL_CONTROL,
> - DOORBELL_EN, 0);
> + if (!amdgpu_async_gfx_ring) {
> + tmp = RREG32_SOC15(GC, 0, mmCP_RB_DOORBELL_CONTROL);
Please use checkpatch.pl to fix the code style issue. And double check it
on SIENNA CICHLID card.
Thanks,
Ray
> + if (ring->use_doorbell) {
> + tmp = REG_SET_FIELD(tmp, CP_RB_DOORBELL_CONTROL,
> + DOORBELL_OFFSET, ring->doorbell_index);
> + tmp = REG_SET_FIELD(tmp, CP_RB_DOORBELL_CONTROL,
> + DOORBELL_EN, 1);
> + } else {
> + tmp = REG_SET_FIELD(tmp, CP_RB_DOORBELL_CONTROL,
> + DOORBELL_EN, 0);
> + }
> + WREG32_SOC15(GC, 0, mmCP_RB_DOORBELL_CONTROL, tmp);
> }
> - WREG32_SOC15(GC, 0, mmCP_RB_DOORBELL_CONTROL, tmp);
> switch (adev->asic_type) {
> case CHIP_SIENNA_CICHLID:
> case CHIP_NAVY_FLOUNDER:
> @@ -6349,6 +6351,8 @@ static int gfx_v10_0_gfx_mqd_init(struct amdgpu_ring *ring)
> DOORBELL_EN, 0);
> mqd->cp_rb_doorbell_control = tmp;
>
> + /* set doorbell range */
> + gfx_v10_0_cp_gfx_set_doorbell(adev, ring);
> /* reset read and write pointers, similar to CP_RB0_WPTR/_RPTR */
> ring->wptr = 0;
> mqd->cp_gfx_hqd_rptr = RREG32_SOC15(GC, 0, mmCP_GFX_HQD_RPTR);
> --
> 2.17.1
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-11-19 10:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-18 12:09 [PATCH] drm/amdgpu: Add gfx doorbell setting for Vangogh Jinzhou Su
2020-11-19 10:36 ` Huang Rui
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox