AMD-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Alex Deucher <alexdeucher-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Cc: Alex Deucher <alexander.deucher-5C7GfCeVMHo@public.gmane.org>,
	Leo Liu <leo.liu-5C7GfCeVMHo@public.gmane.org>
Subject: [PATCH 19/27] drm/amdgpu: enable Doorbell support for Renoir (v2)
Date: Fri,  9 Aug 2019 10:52:54 -0500	[thread overview]
Message-ID: <20190809155302.4733-19-alexander.deucher@amd.com> (raw)
In-Reply-To: <20190809155302.4733-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org>

From: Leo Liu <leo.liu@amd.com>

Add VCN range aperture to NBIO 7.0

v2: rebase (Alex)

Signed-off-by: Leo Liu <leo.liu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c       | 21 ++++++++++++++++++++
 drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c |  4 ++++
 2 files changed, 25 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c
index 73419fa38159..74eecb768a82 100644
--- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c
@@ -91,6 +91,26 @@ static void nbio_v7_0_sdma_doorbell_range(struct amdgpu_device *adev, int instan
 	WREG32(reg, doorbell_range);
 }
 
+static void nbio_v7_0_vcn_doorbell_range(struct amdgpu_device *adev, bool use_doorbell,
+					 int doorbell_index, int instance)
+{
+	u32 reg = SOC15_REG_OFFSET(NBIO, 0, mmBIF_MMSCH0_DOORBELL_RANGE);
+
+	u32 doorbell_range = RREG32(reg);
+
+	if (use_doorbell) {
+		doorbell_range = REG_SET_FIELD(doorbell_range,
+					       BIF_MMSCH0_DOORBELL_RANGE, OFFSET,
+					       doorbell_index);
+		doorbell_range = REG_SET_FIELD(doorbell_range,
+					       BIF_MMSCH0_DOORBELL_RANGE, SIZE, 8);
+	} else
+		doorbell_range = REG_SET_FIELD(doorbell_range,
+					       BIF_MMSCH0_DOORBELL_RANGE, SIZE, 0);
+
+	WREG32(reg, doorbell_range);
+}
+
 static void nbio_v7_0_enable_doorbell_aperture(struct amdgpu_device *adev,
 					       bool enable)
 {
@@ -282,6 +302,7 @@ const struct amdgpu_nbio_funcs nbio_v7_0_funcs = {
 	.hdp_flush = nbio_v7_0_hdp_flush,
 	.get_memsize = nbio_v7_0_get_memsize,
 	.sdma_doorbell_range = nbio_v7_0_sdma_doorbell_range,
+	.vcn_doorbell_range = nbio_v7_0_vcn_doorbell_range,
 	.enable_doorbell_aperture = nbio_v7_0_enable_doorbell_aperture,
 	.enable_doorbell_selfring_aperture = nbio_v7_0_enable_doorbell_selfring_aperture,
 	.ih_doorbell_range = nbio_v7_0_ih_doorbell_range,
diff --git a/drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c b/drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c
index a8e92638a2e8..bd0580334f83 100644
--- a/drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c
+++ b/drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c
@@ -81,6 +81,10 @@ void vega10_doorbell_index_init(struct amdgpu_device *adev)
 	adev->doorbell_index.uvd_vce.vce_ring2_3 = AMDGPU_DOORBELL64_VCE_RING2_3;
 	adev->doorbell_index.uvd_vce.vce_ring4_5 = AMDGPU_DOORBELL64_VCE_RING4_5;
 	adev->doorbell_index.uvd_vce.vce_ring6_7 = AMDGPU_DOORBELL64_VCE_RING6_7;
+	adev->doorbell_index.vcn.vcn_ring0_1 = AMDGPU_DOORBELL64_VCN0_1;
+	adev->doorbell_index.vcn.vcn_ring2_3 = AMDGPU_DOORBELL64_VCN2_3;
+	adev->doorbell_index.vcn.vcn_ring4_5 = AMDGPU_DOORBELL64_VCN4_5;
+	adev->doorbell_index.vcn.vcn_ring6_7 = AMDGPU_DOORBELL64_VCN6_7;
 
 	adev->doorbell_index.first_non_cp = AMDGPU_DOORBELL64_FIRST_NON_CP;
 	adev->doorbell_index.last_non_cp = AMDGPU_DOORBELL64_LAST_NON_CP;
-- 
2.20.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

  parent reply	other threads:[~2019-08-09 15:52 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-09 15:52 [PATCH 00/27] Add Renoir APU support Alex Deucher
     [not found] ` <20190809155302.4733-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
2019-08-09 15:52   ` [PATCH 02/27] drm/amdgpu: add renoir asic_type enum Alex Deucher
2019-08-09 15:52   ` [PATCH 03/27] drm/amdgpu: add renoir support for gpu_info and ip block setting Alex Deucher
2019-08-09 15:52   ` [PATCH 04/27] drm/amdgpu: add soc15 common ip block support for renoir Alex Deucher
2019-08-09 15:52   ` [PATCH 05/27] drm/amdgpu: add gmc v9 supports " Alex Deucher
2019-08-09 15:52   ` [PATCH 06/27] drm/amdgpu: set fw load type " Alex Deucher
2019-08-09 15:52   ` [PATCH 07/27] drm/amdgpu: add gfx support " Alex Deucher
2019-08-09 15:52   ` [PATCH 08/27] drm/amdgpu: add sdma " Alex Deucher
2019-08-09 15:52   ` [PATCH 09/27] drm/amdgpu: set ip blocks " Alex Deucher
2019-08-09 15:52   ` [PATCH 10/27] drm/amdgpu: add renoir pci id Alex Deucher
2019-08-09 15:52   ` [PATCH 11/27] drm/amdgpu: fix no interrupt issue for renoir emu Alex Deucher
2019-08-09 15:52   ` [PATCH 12/27] drm/amdgpu: enable dce virtual ip module for Renoir Alex Deucher
2019-08-09 15:52   ` [PATCH 13/27] drm/amdgpu: add asic funcs for renoir Alex Deucher
2019-08-09 15:52   ` [PATCH 14/27] drm/amdgpu: set rlc " Alex Deucher
2019-08-09 15:52   ` [PATCH 15/27] drm/amdgpu: add psp_v12_0 for renoir (v2) Alex Deucher
2019-08-09 15:52   ` [PATCH 16/27] drm/amdgpu: add gfx golden settings " Alex Deucher
2019-08-09 15:52   ` [PATCH 17/27] drm/amdgpu: add sdma golden settings for renoir Alex Deucher
2019-08-09 15:52   ` [PATCH 18/27] drm/amdgpu: enable Renoir VCN firmware loading Alex Deucher
2019-08-09 15:52   ` Alex Deucher [this message]
2019-08-09 15:52   ` [PATCH 20/27] drm/amdgpu: add VCN2.0 to Renoir IP blocks Alex Deucher
2019-08-09 15:52   ` [PATCH 21/27] drm/amdgpu: enable clock gating for renoir Alex Deucher
2019-08-09 15:52   ` [PATCH 22/27] drm/amdgpu: enable power " Alex Deucher
2019-08-09 15:52   ` [PATCH 23/27] drm/amdgpu: update lbpw " Alex Deucher
2019-08-09 15:52   ` [PATCH 24/27] drm/amdgpu: set fw default loading by psp " Alex Deucher
2019-08-09 15:53   ` [PATCH 25/27] drm/amdgpu: use direct loading on renoir vcn for the moment Alex Deucher
2019-08-09 15:53   ` [PATCH 26/27] drm/amdgpu: skip mec2 jump table loading for renoir Alex Deucher
2019-08-09 15:53   ` [PATCH 27/27] drm/amdgpu: flag renoir as experimental for now Alex Deucher
     [not found]     ` <20190809155302.4733-27-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
2019-08-12  3:57       ` Huang, Ray
2019-08-12  3:58   ` [PATCH 00/27] Add Renoir APU support Huang, Ray

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=20190809155302.4733-19-alexander.deucher@amd.com \
    --to=alexdeucher-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
    --cc=alexander.deucher-5C7GfCeVMHo@public.gmane.org \
    --cc=amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
    --cc=leo.liu-5C7GfCeVMHo@public.gmane.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