Skip to contentSkip to conversation

drm/amdgpu: Remap hdp coherency registers

PATCH In review Zeng, Oak 3 participants 6 messages Apr 11, 2019 – Apr 15, 2019 4 messages not in the archive

Subsystems (3)
lore
Share & tools
lore

Zeng, Oak

author
#0 lore raw

PATCH 1/2 drm/amdgpu: Remap hdp coherency registers

Remap HDP_MEM_COHERENCY_FLUSH_CNTL and HDP_REG_COHERENCY_FLUSH_CNTL to an empty page in mmio space. We will later map this page to process space so application can flush hdp. This can't be done properly at those registers' original location because it will expose more than desired registers to process space.

Change-Id Ia8d27c0c9a082711d16bbf55602bf5712a47b6d6
---
 drivers/gpu/drm/amd/amdgpu/amdgpu.h    |  6 +++++-
 drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c |  2 +-
 drivers/gpu/drm/amd/amdgpu/nbio_v6_1.h |  2 +-
 drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c |  7 +++----
 drivers/gpu/drm/amd/amdgpu/nbio_v7_0.h |  2 +-
 drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c |  7 +++----
 drivers/gpu/drm/amd/amdgpu/nbio_v7_4.h |  2 +-
 drivers/gpu/drm/amd/amdgpu/soc15.c     | 22 ++++++++++++++++++++++
 8 files changed, 37 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +5 -1
index bc96ec4..840be05 100644
@@ -644,6 +644,10 @@ struct nbio_hdp_flush_reg {
 
 struct amdgpu_nbio_funcs {
 	const struct nbio_hdp_flush_reg *hdp_flush_reg;
+	u32 remapped_hdp_mem_flush_cntl_reg_offset;
+	u32 remapped_hdp_reg_flush_cntl_reg_offset;
+	resource_size_t remapped_hdp_mem_flush_cntl_physical_addr;
+	resource_size_t remapped_hdp_reg_flush_cntl_physical_addr;
 	u32 (*get_hdp_flush_req_offset)(struct amdgpu_device *adev);
 	u32 (*get_hdp_flush_done_offset)(struct amdgpu_device *adev);
 	u32 (*get_pcie_index_offset)(struct amdgpu_device *adev);
@@ -905,7 +909,7 @@ struct amdgpu_device {
 	/* soc15 register offset based on ip, instance and  segment */
 	uint32_t 		*reg_offset[MAX_HWIP][HWIP_MAX_INSTANCE];
 
-	const struct amdgpu_nbio_funcs	*nbio_funcs;
+	struct amdgpu_nbio_funcs	*nbio_funcs;
 	const struct amdgpu_df_funcs	*df_funcs;
 
 	/* delayed work_func for deferring clockgating during resume */
drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c +1 -1
index 6590143..2470b8e 100644
@@ -276,7 +276,7 @@ static void nbio_v6_1_init_registers(struct amdgpu_device *adev)
 		WREG32_PCIE(smnPCIE_CI_CNTL, data);
 }
 
-const struct amdgpu_nbio_funcs nbio_v6_1_funcs = {
+struct amdgpu_nbio_funcs nbio_v6_1_funcs = {
 	.hdp_flush_reg = &nbio_v6_1_hdp_flush_reg,
 	.get_hdp_flush_req_offset = nbio_v6_1_get_hdp_flush_req_offset,
 	.get_hdp_flush_done_offset = nbio_v6_1_get_hdp_flush_done_offset,
drivers/gpu/drm/amd/amdgpu/nbio_v6_1.h +1 -1
index 0743a6f..d409bb6 100644
@@ -26,6 +26,6 @@
 
 #include "soc15_common.h"
 
-extern const struct amdgpu_nbio_funcs nbio_v6_1_funcs;
+extern struct amdgpu_nbio_funcs nbio_v6_1_funcs;
 
 #endif
drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c +3 -4
index 1cdb98a..9a5abf5 100644
@@ -55,10 +55,9 @@ static void nbio_v7_0_hdp_flush(struct amdgpu_device *adev,
 				struct amdgpu_ring *ring)
 {
 	if (!ring || !ring->funcs->emit_wreg)
-		WREG32_SOC15_NO_KIQ(NBIO, 0, mmHDP_MEM_COHERENCY_FLUSH_CNTL, 0);
+		WREG32_NO_KIQ(adev->nbio_funcs->remapped_hdp_mem_flush_cntl_reg_offset, 0);
 	else
-		amdgpu_ring_emit_wreg(ring, SOC15_REG_OFFSET(
-			NBIO, 0, mmHDP_MEM_COHERENCY_FLUSH_CNTL), 0);
+		amdgpu_ring_emit_wreg(ring, adev->nbio_funcs->remapped_hdp_mem_flush_cntl_reg_offset, 0);
 }
 
 static u32 nbio_v7_0_get_memsize(struct amdgpu_device *adev)
@@ -263,7 +262,7 @@ static void nbio_v7_0_init_registers(struct amdgpu_device *adev)
 
 }
 
-const struct amdgpu_nbio_funcs nbio_v7_0_funcs = {
+struct amdgpu_nbio_funcs nbio_v7_0_funcs = {
 	.hdp_flush_reg = &nbio_v7_0_hdp_flush_reg,
 	.get_hdp_flush_req_offset = nbio_v7_0_get_hdp_flush_req_offset,
 	.get_hdp_flush_done_offset = nbio_v7_0_get_hdp_flush_done_offset,
drivers/gpu/drm/amd/amdgpu/nbio_v7_0.h +1 -1
index 508d549..db50618 100644
@@ -26,6 +26,6 @@
 
 #include "soc15_common.h"
 
-extern const struct amdgpu_nbio_funcs nbio_v7_0_funcs;
+extern struct amdgpu_nbio_funcs nbio_v7_0_funcs;
 
 #endif
drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c +3 -4
index c69d515..25203cc 100644
@@ -53,10 +53,9 @@ static void nbio_v7_4_hdp_flush(struct amdgpu_device *adev,
 				struct amdgpu_ring *ring)
 {
 	if (!ring || !ring->funcs->emit_wreg)
-		WREG32_SOC15_NO_KIQ(NBIO, 0, mmHDP_MEM_COHERENCY_FLUSH_CNTL, 0);
+		WREG32_NO_KIQ(adev->nbio_funcs->remapped_hdp_mem_flush_cntl_reg_offset, 0);
 	else
-		amdgpu_ring_emit_wreg(ring, SOC15_REG_OFFSET(
-			NBIO, 0, mmHDP_MEM_COHERENCY_FLUSH_CNTL), 0);
+		amdgpu_ring_emit_wreg(ring, adev->nbio_funcs->remapped_hdp_mem_flush_cntl_reg_offset, 0);
 }
 
 static u32 nbio_v7_4_get_memsize(struct amdgpu_device *adev)
@@ -242,7 +241,7 @@ static void nbio_v7_4_init_registers(struct amdgpu_device *adev)
 		WREG32_PCIE(smnPCIE_CI_CNTL, data);
 }
 
-const struct amdgpu_nbio_funcs nbio_v7_4_funcs = {
+struct amdgpu_nbio_funcs nbio_v7_4_funcs = {
 	.hdp_flush_reg = &nbio_v7_4_hdp_flush_reg,
 	.get_hdp_flush_req_offset = nbio_v7_4_get_hdp_flush_req_offset,
 	.get_hdp_flush_done_offset = nbio_v7_4_get_hdp_flush_done_offset,
drivers/gpu/drm/amd/amdgpu/nbio_v7_4.h +1 -1
index c442865..2e5bb03 100644
@@ -26,6 +26,6 @@
 
 #include "soc15_common.h"
 
-extern const struct amdgpu_nbio_funcs nbio_v7_4_funcs;
+extern struct amdgpu_nbio_funcs nbio_v7_4_funcs;
 
 #endif
drivers/gpu/drm/amd/amdgpu/soc15.c +22 -0
index bdb5ad9..c47e7a5 100644
@@ -44,6 +44,7 @@
 #include "smuio/smuio_9_0_offset.h"
 #include "smuio/smuio_9_0_sh_mask.h"
 #include "nbio/nbio_7_0_default.h"
+#include "nbio/nbio_7_0_offset.h"
 #include "nbio/nbio_7_0_sh_mask.h"
 #include "nbio/nbio_7_0_smn.h"
 #include "mp/mp_9_0_offset.h"
@@ -775,6 +776,26 @@ static const struct amdgpu_asic_funcs vega20_asic_funcs =
 	.need_reset_on_init = &soc15_need_reset_on_init,
 };
 
+static void soc15_remap_hdp_coherency_registers(struct amdgpu_device *adev)
+{
+	/* Remap hdp coherency registers to the last page of mmio
+	 * space, for the purpose of mapping them to process space(
+	 * so process can flush hdp)
+	 */
+	WREG32_SOC15(NBIO, 0, mmREMAP_HDP_MEM_FLUSH_CNTL,
+			adev->rmmio_size - PAGE_SIZE);
+	WREG32_SOC15(NBIO, 0, mmREMAP_HDP_REG_FLUSH_CNTL,
+			adev->rmmio_size - PAGE_SIZE + 4);
+	adev->nbio_funcs->remapped_hdp_mem_flush_cntl_reg_offset =
+			(adev->rmmio_size - PAGE_SIZE) >> 2;
+	adev->nbio_funcs->remapped_hdp_reg_flush_cntl_reg_offset =
+			(adev->rmmio_size - PAGE_SIZE + 4) >> 2;
+	adev->nbio_funcs->remapped_hdp_mem_flush_cntl_physical_addr =
+			adev->rmmio_base + adev->rmmio_size - PAGE_SIZE;
+	adev->nbio_funcs->remapped_hdp_reg_flush_cntl_physical_addr =
+			adev->rmmio_base + adev->rmmio_size - PAGE_SIZE + 4;
+}
+
 static int soc15_common_early_init(void *handle)
 {
 	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
@@ -794,6 +815,7 @@ static int soc15_common_early_init(void *handle)
 
 
 	adev->external_rev_id = 0xFF;
+	soc15_remap_hdp_coherency_registers(adev);
 	switch (adev->asic_type) {
 	case CHIP_VEGA10:
 		adev->asic_funcs = &soc15_asic_funcs;
Signature · 6 lines
2.7.4

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 1555014669-30077-1-git-send-email-Oak.Zeng-5C7GfCeVMHo@public.gmane.org

author
#2 lore raw

PATCH 2/2 drm/amdkfd: Expose HDP registers to user space

Introduce a new memory type (KFD_IOC_ALLOC_MEM_FLAGS_HDP_FLUSH) and expose mmio page of HDP registers to user space through this new memory type.

Change-Id If5ac13c46ea7fbd2194ddc8b2ece26ef4f76c330
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c       | 7 +++++++
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h       | 1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 7 ++++---
 drivers/gpu/drm/amd/amdkfd/kfd_chardev.c         | 2 ++
 drivers/gpu/drm/amd/include/kgd_kfd_interface.h  | 1 +
 include/uapi/linux/kfd_ioctl.h                   | 1 +
 6 files changed, 16 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +7 -0
index acf8ae0..d844f0c 100644
@@ -482,6 +482,13 @@ uint64_t amdgpu_amdkfd_get_hive_id(struct kgd_dev *kgd)
 	return adev->gmc.xgmi.hive_id;
 }
 
+uint64_t amdgpu_amdkfd_get_hdp_register_physical_addr(struct kgd_dev *kgd)
+{
+	struct amdgpu_device *adev = (struct amdgpu_device *)kgd;
+
+	return adev->nbio_funcs->remapped_hdp_mem_flush_cntl_physical_addr;
+}
+
 int amdgpu_amdkfd_submit_ib(struct kgd_dev *kgd, enum kgd_engine_type engine,
 				uint32_t vmid, uint64_t gpu_addr,
 				uint32_t *ib_cmd, uint32_t ib_len)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +1 -0
index e6a5037..e778679 100644
@@ -154,6 +154,7 @@ int amdgpu_amdkfd_get_dmabuf_info(struct kgd_dev *kgd, int dma_buf_fd,
 				  uint32_t *flags);
 uint64_t amdgpu_amdkfd_get_vram_usage(struct kgd_dev *kgd);
 uint64_t amdgpu_amdkfd_get_hive_id(struct kgd_dev *kgd);
+uint64_t amdgpu_amdkfd_get_hdp_register_physical_addr(struct kgd_dev *kgd);
 
 #define read_user_wptr(mmptr, wptr, dst)				\
 	({								\
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +4 -3
index 047bba8..4394f61 100644
@@ -1087,7 +1087,8 @@ int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu(
 		if (!offset || !*offset)
 			return -EINVAL;
 		user_addr = *offset;
-	} else if (flags & ALLOC_MEM_FLAGS_DOORBELL) {
+	} else if (flags & (ALLOC_MEM_FLAGS_DOORBELL |
+			ALLOC_MEM_FLAGS_HDP_FLUSH)) {
 		domain = AMDGPU_GEM_DOMAIN_GTT;
 		alloc_domain = AMDGPU_GEM_DOMAIN_CPU;
 		bo_type = ttm_bo_type_sg;
@@ -1263,8 +1264,8 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu(
 	/* Free the sync object */
 	amdgpu_sync_free(&mem->sync);
 
-	/* If the SG is not NULL, it's one we created for a doorbell
-	 * BO. We need to free it.
+	/* If the SG is not NULL, it's one we created for a doorbell or hdp
+	 * flush BO. We need to free it.
 	 */
 	if (mem->bo->tbo.sg) {
 		sg_free_table(mem->bo->tbo.sg);
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +2 -0
index 083bd81..f08bdce 100644
@@ -1272,6 +1272,8 @@ static int kfd_ioctl_alloc_memory_of_gpu(struct file *filep,
 		if (args->size != kfd_doorbell_process_slice(dev))
 			return -EINVAL;
 		offset = kfd_get_process_doorbells(dev, p);
+	} else if (flags & KFD_IOC_ALLOC_MEM_FLAGS_HDP_FLUSH) {
+		offset = amdgpu_amdkfd_get_hdp_register_physical_addr(dev->kgd);
 	}
 
 	mutex_lock(&p->mutex);
drivers/gpu/drm/amd/include/kgd_kfd_interface.h +1 -0
index 5f3c10e..3bc78b26 100644
@@ -186,6 +186,7 @@ struct tile_config {
 #define ALLOC_MEM_FLAGS_GTT		(1 << 1)
 #define ALLOC_MEM_FLAGS_USERPTR		(1 << 2)
 #define ALLOC_MEM_FLAGS_DOORBELL	(1 << 3)
+#define ALLOC_MEM_FLAGS_HDP_FLUSH	(1 << 4)
 
 /*
  * Allocation flags attributes/access options.
include/uapi/linux/kfd_ioctl.h +1 -0
index dc067ed..96afd01 100644
@@ -338,6 +338,7 @@ struct kfd_ioctl_acquire_vm_args {
 #define KFD_IOC_ALLOC_MEM_FLAGS_GTT		(1 << 1)
 #define KFD_IOC_ALLOC_MEM_FLAGS_USERPTR		(1 << 2)
 #define KFD_IOC_ALLOC_MEM_FLAGS_DOORBELL	(1 << 3)
+#define KFD_IOC_ALLOC_MEM_FLAGS_HDP_FLUSH	(1 << 4)
 /* Allocation flags: attributes/access options */
 #define KFD_IOC_ALLOC_MEM_FLAGS_WRITABLE	(1 << 31)
 #define KFD_IOC_ALLOC_MEM_FLAGS_EXECUTABLE	(1 << 30)
Signature · 6 lines
2.7.4

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#3 lore raw
In reply to a message not in the archive

Am 11.04.19 um 22:31 schrieb Zeng, Oak:

Quoted 35 lines

Remap HDP_MEM_COHERENCY_FLUSH_CNTL and HDP_REG_COHERENCY_FLUSH_CNTL to an empty page in mmio space. We will later map this page to process space so application can flush hdp. This can't be done properly at those registers' original location because it will expose more than desired registers to process space.

Change-Id Ia8d27c0c9a082711d16bbf55602bf5712a47b6d6
---
  drivers/gpu/drm/amd/amdgpu/amdgpu.h    |  6 +++++-
  drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c |  2 +-
  drivers/gpu/drm/amd/amdgpu/nbio_v6_1.h |  2 +-
  drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c |  7 +++----
  drivers/gpu/drm/amd/amdgpu/nbio_v7_0.h |  2 +-
  drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c |  7 +++----
  drivers/gpu/drm/amd/amdgpu/nbio_v7_4.h |  2 +-
  drivers/gpu/drm/amd/amdgpu/soc15.c     | 22 ++++++++++++++++++++++
  8 files changed, 37 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +4 -0
index bc96ec4..840be05 100644
@@ -644,6 +644,10 @@ struct nbio_hdp_flush_reg {
 
  struct amdgpu_nbio_funcs {
  	const struct nbio_hdp_flush_reg *hdp_flush_reg;
+	u32 remapped_hdp_mem_flush_cntl_reg_offset;
+	u32 remapped_hdp_reg_flush_cntl_reg_offset;
+	resource_size_t remapped_hdp_mem_flush_cntl_physical_addr;
+	resource_size_t remapped_hdp_reg_flush_cntl_physical_addr;
  	u32 (*get_hdp_flush_req_offset)(struct amdgpu_device *adev);
  	u32 (*get_hdp_flush_done_offset)(struct amdgpu_device *adev);
  	u32 (*get_pcie_index_offset)(struct amdgpu_device *adev);

drivers/gpu/drm/amd/amdgpu/amdgpu.h struct amdgpu_device { · line 912

Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -1
@@ -905,7 +909,7 @@ struct amdgpu_device {
  	/* soc15 register offset based on ip, instance and  segment */
  	uint32_t 		*reg_offset[MAX_HWIP][HWIP_MAX_INSTANCE];
 
-	const struct amdgpu_nbio_funcs	*nbio_funcs;
+	struct amdgpu_nbio_funcs	*nbio_funcs;

Please kep the function pointers constant. Those should never be changed on a running system.

Christian.

Quoted 144 lines
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -0
  	const struct amdgpu_df_funcs	*df_funcs;
 
  	/* delayed work_func for deferring clockgating during resume */
drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c +1 -1
index 6590143..2470b8e 100644
@@ -276,7 +276,7 @@ static void nbio_v6_1_init_registers(struct amdgpu_device *adev)
  		WREG32_PCIE(smnPCIE_CI_CNTL, data);
  }
 
-const struct amdgpu_nbio_funcs nbio_v6_1_funcs = {
+struct amdgpu_nbio_funcs nbio_v6_1_funcs = {
  	.hdp_flush_reg = &nbio_v6_1_hdp_flush_reg,
  	.get_hdp_flush_req_offset = nbio_v6_1_get_hdp_flush_req_offset,
  	.get_hdp_flush_done_offset = nbio_v6_1_get_hdp_flush_done_offset,
drivers/gpu/drm/amd/amdgpu/nbio_v6_1.h +1 -1
index 0743a6f..d409bb6 100644
@@ -26,6 +26,6 @@
 
  #include "soc15_common.h"
 
-extern const struct amdgpu_nbio_funcs nbio_v6_1_funcs;
+extern struct amdgpu_nbio_funcs nbio_v6_1_funcs;
 
  #endif
drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c +3 -4
index 1cdb98a..9a5abf5 100644
@@ -55,10 +55,9 @@ static void nbio_v7_0_hdp_flush(struct amdgpu_device *adev,
  				struct amdgpu_ring *ring)
  {
  	if (!ring || !ring->funcs->emit_wreg)
-		WREG32_SOC15_NO_KIQ(NBIO, 0, mmHDP_MEM_COHERENCY_FLUSH_CNTL, 0);
+		WREG32_NO_KIQ(adev->nbio_funcs->remapped_hdp_mem_flush_cntl_reg_offset, 0);
  	else
-		amdgpu_ring_emit_wreg(ring, SOC15_REG_OFFSET(
-			NBIO, 0, mmHDP_MEM_COHERENCY_FLUSH_CNTL), 0);
+		amdgpu_ring_emit_wreg(ring, adev->nbio_funcs->remapped_hdp_mem_flush_cntl_reg_offset, 0);
  }
 
  static u32 nbio_v7_0_get_memsize(struct amdgpu_device *adev)
@@ -263,7 +262,7 @@ static void nbio_v7_0_init_registers(struct amdgpu_device *adev)
 
  }
 
-const struct amdgpu_nbio_funcs nbio_v7_0_funcs = {
+struct amdgpu_nbio_funcs nbio_v7_0_funcs = {
  	.hdp_flush_reg = &nbio_v7_0_hdp_flush_reg,
  	.get_hdp_flush_req_offset = nbio_v7_0_get_hdp_flush_req_offset,
  	.get_hdp_flush_done_offset = nbio_v7_0_get_hdp_flush_done_offset,
drivers/gpu/drm/amd/amdgpu/nbio_v7_0.h +1 -1
index 508d549..db50618 100644
@@ -26,6 +26,6 @@
 
  #include "soc15_common.h"
 
-extern const struct amdgpu_nbio_funcs nbio_v7_0_funcs;
+extern struct amdgpu_nbio_funcs nbio_v7_0_funcs;
 
  #endif
drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c +3 -4
index c69d515..25203cc 100644
@@ -53,10 +53,9 @@ static void nbio_v7_4_hdp_flush(struct amdgpu_device *adev,
  				struct amdgpu_ring *ring)
  {
  	if (!ring || !ring->funcs->emit_wreg)
-		WREG32_SOC15_NO_KIQ(NBIO, 0, mmHDP_MEM_COHERENCY_FLUSH_CNTL, 0);
+		WREG32_NO_KIQ(adev->nbio_funcs->remapped_hdp_mem_flush_cntl_reg_offset, 0);
  	else
-		amdgpu_ring_emit_wreg(ring, SOC15_REG_OFFSET(
-			NBIO, 0, mmHDP_MEM_COHERENCY_FLUSH_CNTL), 0);
+		amdgpu_ring_emit_wreg(ring, adev->nbio_funcs->remapped_hdp_mem_flush_cntl_reg_offset, 0);
  }
 
  static u32 nbio_v7_4_get_memsize(struct amdgpu_device *adev)
@@ -242,7 +241,7 @@ static void nbio_v7_4_init_registers(struct amdgpu_device *adev)
  		WREG32_PCIE(smnPCIE_CI_CNTL, data);
  }
 
-const struct amdgpu_nbio_funcs nbio_v7_4_funcs = {
+struct amdgpu_nbio_funcs nbio_v7_4_funcs = {
  	.hdp_flush_reg = &nbio_v7_4_hdp_flush_reg,
  	.get_hdp_flush_req_offset = nbio_v7_4_get_hdp_flush_req_offset,
  	.get_hdp_flush_done_offset = nbio_v7_4_get_hdp_flush_done_offset,
drivers/gpu/drm/amd/amdgpu/nbio_v7_4.h +1 -1
index c442865..2e5bb03 100644
@@ -26,6 +26,6 @@
 
  #include "soc15_common.h"
 
-extern const struct amdgpu_nbio_funcs nbio_v7_4_funcs;
+extern struct amdgpu_nbio_funcs nbio_v7_4_funcs;
 
  #endif
drivers/gpu/drm/amd/amdgpu/soc15.c +21 -0
index bdb5ad9..c47e7a5 100644
@@ -44,6 +44,7 @@
  #include "smuio/smuio_9_0_offset.h"
  #include "smuio/smuio_9_0_sh_mask.h"
  #include "nbio/nbio_7_0_default.h"
+#include "nbio/nbio_7_0_offset.h"
  #include "nbio/nbio_7_0_sh_mask.h"
  #include "nbio/nbio_7_0_smn.h"
  #include "mp/mp_9_0_offset.h"
@@ -775,6 +776,26 @@ static const struct amdgpu_asic_funcs vega20_asic_funcs =
  	.need_reset_on_init = &soc15_need_reset_on_init,
  };
 
+static void soc15_remap_hdp_coherency_registers(struct amdgpu_device *adev)
+{
+	/* Remap hdp coherency registers to the last page of mmio
+	 * space, for the purpose of mapping them to process space(
+	 * so process can flush hdp)
+	 */
+	WREG32_SOC15(NBIO, 0, mmREMAP_HDP_MEM_FLUSH_CNTL,
+			adev->rmmio_size - PAGE_SIZE);
+	WREG32_SOC15(NBIO, 0, mmREMAP_HDP_REG_FLUSH_CNTL,
+			adev->rmmio_size - PAGE_SIZE + 4);
+	adev->nbio_funcs->remapped_hdp_mem_flush_cntl_reg_offset =
+			(adev->rmmio_size - PAGE_SIZE) >> 2;
+	adev->nbio_funcs->remapped_hdp_reg_flush_cntl_reg_offset =
+			(adev->rmmio_size - PAGE_SIZE + 4) >> 2;
+	adev->nbio_funcs->remapped_hdp_mem_flush_cntl_physical_addr =
+			adev->rmmio_base + adev->rmmio_size - PAGE_SIZE;
+	adev->nbio_funcs->remapped_hdp_reg_flush_cntl_physical_addr =
+			adev->rmmio_base + adev->rmmio_size - PAGE_SIZE + 4;
+}
+
  static int soc15_common_early_init(void *handle)
  {
  	struct amdgpu_device *adev = (struct amdgpu_device *)handle;

drivers/gpu/drm/amd/amdgpu/soc15.c static int soc15_common_early_init(void *handle) · line 821

Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/soc15.c +1 -0
@@ -794,6 +815,7 @@ static int soc15_common_early_init(void *handle)
 
 
  	adev->external_rev_id = 0xFF;
+	soc15_remap_hdp_coherency_registers(adev);
  	switch (adev->asic_type) {
  	case CHIP_VEGA10:
  		adev->asic_funcs = &soc15_asic_funcs;

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 9cc46562-129b-5e1f-14a9-6244ede19f3e-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org

author
#5 lore raw

Hi Christian,

After hdp registers are moved to a new place in mmio space, we can't access those registers through the pre-defined register offset. I recorded the new register offset in struct amdgpu_nbio_funcs (because those registers are nbio registers) and initialized them in the early init. After those changes, I can't keep instance of struct amdgpu_nbio_funcs to be constant anymore - we don't know the new register offset before the remap function. When I made the change, I also felt not comfortable. Do you have any better solution? Introduce new r/w members directly to adev? - I also feel not comfortable because those registers I added belongs to nbio by nature...

Regards,
Oak

-----Original Message-----
From: Christian König <[email protected]>
Sent: Friday, April 12, 2019 3:24 AM
To: Zeng, Oak <[email protected]>; [email protected]
Cc: Deucher, Alexander <[email protected]>; Kuehling, Felix <[email protected]>; Keely, Sean <[email protected]>
Subject: Re: [PATCH 1/2] drm/amdgpu: Remap hdp coherency registers

Am 11.04.19 um 22:31 schrieb Zeng, Oak:

Quoted 31 lines

Remap HDP_MEM_COHERENCY_FLUSH_CNTL and HDP_REG_COHERENCY_FLUSH_CNTL to an empty page in mmio space. We will later map this page to process space so application can flush hdp. This can't be done properly at those registers' original location because it will expose more than desired registers to process space.

Change-Id Ia8d27c0c9a082711d16bbf55602bf5712a47b6d6
---
  drivers/gpu/drm/amd/amdgpu/amdgpu.h    |  6 +++++-
  drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c |  2 +-
  drivers/gpu/drm/amd/amdgpu/nbio_v6_1.h |  2 +-
  drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c |  7 +++----
  drivers/gpu/drm/amd/amdgpu/nbio_v7_0.h |  2 +-
  drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c |  7 +++----
  drivers/gpu/drm/amd/amdgpu/nbio_v7_4.h |  2 +-
  drivers/gpu/drm/amd/amdgpu/soc15.c     | 22 ++++++++++++++++++++++
  8 files changed, 37 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +3 -0
index bc96ec4..840be05 100644
@@ -644,6 +644,10 @@ struct nbio_hdp_flush_reg {
 
  struct amdgpu_nbio_funcs {
  	const struct nbio_hdp_flush_reg *hdp_flush_reg;
+	u32 remapped_hdp_mem_flush_cntl_reg_offset;
+	u32 remapped_hdp_reg_flush_cntl_reg_offset;
+	resource_size_t remapped_hdp_mem_flush_cntl_physical_addr;

drivers/gpu/drm/amd/amdgpu/amdgpu.h struct nbio_hdp_flush_reg {

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu.h +3 -1
+	resource_size_t remapped_hdp_reg_flush_cntl_physical_addr;
  	u32 (*get_hdp_flush_req_offset)(struct amdgpu_device *adev);
  	u32 (*get_hdp_flush_done_offset)(struct amdgpu_device *adev);
  	u32 (*get_pcie_index_offset)(struct amdgpu_device *adev); @@ -905,7 
+909,7 @@ struct amdgpu_device {
  	/* soc15 register offset based on ip, instance and  segment */
  	uint32_t 		*reg_offset[MAX_HWIP][HWIP_MAX_INSTANCE];
 
-	const struct amdgpu_nbio_funcs	*nbio_funcs;
+	struct amdgpu_nbio_funcs	*nbio_funcs;

Please kep the function pointers constant. Those should never be changed on a running system.

Christian.

Quoted 154 lines

const struct amdgpu_df_funcs *df_funcs;

/* delayed work_func for deferring clockgating during resume */

drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c +1 -1
index 6590143..2470b8e 100644
@@ -276,7 +276,7 @@ static void nbio_v6_1_init_registers(struct amdgpu_device *adev)
  		WREG32_PCIE(smnPCIE_CI_CNTL, data);
  }
 
-const struct amdgpu_nbio_funcs nbio_v6_1_funcs = {
+struct amdgpu_nbio_funcs nbio_v6_1_funcs = {
  	.hdp_flush_reg = &nbio_v6_1_hdp_flush_reg,
  	.get_hdp_flush_req_offset = nbio_v6_1_get_hdp_flush_req_offset,
  	.get_hdp_flush_done_offset = nbio_v6_1_get_hdp_flush_done_offset,
drivers/gpu/drm/amd/amdgpu/nbio_v6_1.h +1 -1
index 0743a6f..d409bb6 100644
@@ -26,6 +26,6 @@
 
  #include "soc15_common.h"
 
-extern const struct amdgpu_nbio_funcs nbio_v6_1_funcs;
+extern struct amdgpu_nbio_funcs nbio_v6_1_funcs;
 
  #endif
drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c +5 -4
index 1cdb98a..9a5abf5 100644
@@ -55,10 +55,9 @@ static void nbio_v7_0_hdp_flush(struct amdgpu_device *adev,
  				struct amdgpu_ring *ring)
  {
  	if (!ring || !ring->funcs->emit_wreg)
-		WREG32_SOC15_NO_KIQ(NBIO, 0, mmHDP_MEM_COHERENCY_FLUSH_CNTL, 0);
+		
+WREG32_NO_KIQ(adev->nbio_funcs->remapped_hdp_mem_flush_cntl_reg_offse
+t, 0);
  	else
-		amdgpu_ring_emit_wreg(ring, SOC15_REG_OFFSET(
-			NBIO, 0, mmHDP_MEM_COHERENCY_FLUSH_CNTL), 0);
+		amdgpu_ring_emit_wreg(ring, 
+adev->nbio_funcs->remapped_hdp_mem_flush_cntl_reg_offset, 0);
  }
 
  static u32 nbio_v7_0_get_memsize(struct amdgpu_device *adev) @@ 
-263,7 +262,7 @@ static void nbio_v7_0_init_registers(struct 

amdgpu_device *adev)

  }
drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c +1 -1
-const struct amdgpu_nbio_funcs nbio_v7_0_funcs = {
+struct amdgpu_nbio_funcs nbio_v7_0_funcs = {
  	.hdp_flush_reg = &nbio_v7_0_hdp_flush_reg,
  	.get_hdp_flush_req_offset = nbio_v7_0_get_hdp_flush_req_offset,
  	.get_hdp_flush_done_offset = nbio_v7_0_get_hdp_flush_done_offset,
drivers/gpu/drm/amd/amdgpu/nbio_v7_0.h +1 -1
index 508d549..db50618 100644
@@ -26,6 +26,6 @@
 
  #include "soc15_common.h"
 
-extern const struct amdgpu_nbio_funcs nbio_v7_0_funcs;
+extern struct amdgpu_nbio_funcs nbio_v7_0_funcs;
 
  #endif
drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c +6 -5
index c69d515..25203cc 100644
@@ -53,10 +53,9 @@ static void nbio_v7_4_hdp_flush(struct amdgpu_device *adev,
  				struct amdgpu_ring *ring)
  {
  	if (!ring || !ring->funcs->emit_wreg)
-		WREG32_SOC15_NO_KIQ(NBIO, 0, mmHDP_MEM_COHERENCY_FLUSH_CNTL, 0);
+		
+WREG32_NO_KIQ(adev->nbio_funcs->remapped_hdp_mem_flush_cntl_reg_offse
+t, 0);
  	else
-		amdgpu_ring_emit_wreg(ring, SOC15_REG_OFFSET(
-			NBIO, 0, mmHDP_MEM_COHERENCY_FLUSH_CNTL), 0);
+		amdgpu_ring_emit_wreg(ring, 
+adev->nbio_funcs->remapped_hdp_mem_flush_cntl_reg_offset, 0);
  }
 
  static u32 nbio_v7_4_get_memsize(struct amdgpu_device *adev) @@ 
-242,7 +241,7 @@ static void nbio_v7_4_init_registers(struct amdgpu_device *adev)
  		WREG32_PCIE(smnPCIE_CI_CNTL, data);
  }
 
-const struct amdgpu_nbio_funcs nbio_v7_4_funcs = {
+struct amdgpu_nbio_funcs nbio_v7_4_funcs = {
  	.hdp_flush_reg = &nbio_v7_4_hdp_flush_reg,
  	.get_hdp_flush_req_offset = nbio_v7_4_get_hdp_flush_req_offset,
  	.get_hdp_flush_done_offset = nbio_v7_4_get_hdp_flush_done_offset,
drivers/gpu/drm/amd/amdgpu/nbio_v7_4.h +1 -1
index c442865..2e5bb03 100644
@@ -26,6 +26,6 @@
 
  #include "soc15_common.h"
 
-extern const struct amdgpu_nbio_funcs nbio_v7_4_funcs;
+extern struct amdgpu_nbio_funcs nbio_v7_4_funcs;
 
  #endif
drivers/gpu/drm/amd/amdgpu/soc15.c +20 -0
index bdb5ad9..c47e7a5 100644
@@ -44,6 +44,7 @@
  #include "smuio/smuio_9_0_offset.h"
  #include "smuio/smuio_9_0_sh_mask.h"
  #include "nbio/nbio_7_0_default.h"
+#include "nbio/nbio_7_0_offset.h"
  #include "nbio/nbio_7_0_sh_mask.h"
  #include "nbio/nbio_7_0_smn.h"
  #include "mp/mp_9_0_offset.h"
@@ -775,6 +776,26 @@ static const struct amdgpu_asic_funcs vega20_asic_funcs =
  	.need_reset_on_init = &soc15_need_reset_on_init,
  };
 
+static void soc15_remap_hdp_coherency_registers(struct amdgpu_device 
+*adev) {
+	/* Remap hdp coherency registers to the last page of mmio
+	 * space, for the purpose of mapping them to process space(
+	 * so process can flush hdp)
+	 */
+	WREG32_SOC15(NBIO, 0, mmREMAP_HDP_MEM_FLUSH_CNTL,
+			adev->rmmio_size - PAGE_SIZE);
+	WREG32_SOC15(NBIO, 0, mmREMAP_HDP_REG_FLUSH_CNTL,
+			adev->rmmio_size - PAGE_SIZE + 4);
+	adev->nbio_funcs->remapped_hdp_mem_flush_cntl_reg_offset =
+			(adev->rmmio_size - PAGE_SIZE) >> 2;
+	adev->nbio_funcs->remapped_hdp_reg_flush_cntl_reg_offset =
+			(adev->rmmio_size - PAGE_SIZE + 4) >> 2;
+	adev->nbio_funcs->remapped_hdp_mem_flush_cntl_physical_addr =
+			adev->rmmio_base + adev->rmmio_size - PAGE_SIZE;
+	adev->nbio_funcs->remapped_hdp_reg_flush_cntl_physical_addr =
+			adev->rmmio_base + adev->rmmio_size - PAGE_SIZE + 4; }
+
  static int soc15_common_early_init(void *handle)

drivers/gpu/drm/amd/amdgpu/soc15.c static const struct amdgpu_asic_funcs vega20_asic_funcs =

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/soc15.c +1 -1
  {
  	struct amdgpu_device *adev = (struct amdgpu_device *)handle; @@ 
-794,6 +815,7 @@ static int soc15_common_early_init(void *handle)
 
 
  	adev->external_rev_id = 0xFF;
+	soc15_remap_hdp_coherency_registers(adev);
  	switch (adev->asic_type) {
  	case CHIP_VEGA10:
  		adev->asic_funcs = &soc15_asic_funcs;

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): BL0PR12MB25804A7060A56A0EAD36D97180280-b4cIHhjg/p/[email protected]

#7 lore raw

Hi Oak,

well, we make the function pointer structures constant is exactly to prevent those scenarios.

Background is that multiple GPU can use the same function pointer structure, but with different register offsets. So what you do here is actually illegal and could break in some cases.

Easiest solution would indeed be to add a new stuff directly to the adev, probably best encapsulated in a new structure.

Regards,
Christian.

Am 12.04.19 um 17:39 schrieb Zeng, Oak:

Quoted 219 lines

Hi Christian,

After hdp registers are moved to a new place in mmio space, we can't access those registers through the pre-defined register offset. I recorded the new register offset in struct amdgpu_nbio_funcs (because those registers are nbio registers) and initialized them in the early init. After those changes, I can't keep instance of struct amdgpu_nbio_funcs to be constant anymore - we don't know the new register offset before the remap function. When I made the change, I also felt not comfortable. Do you have any better solution? Introduce new r/w members directly to adev? - I also feel not comfortable because those registers I added belongs to nbio by nature...

Regards,
Oak

-----Original Message-----
From: Christian König <[email protected]>
Sent: Friday, April 12, 2019 3:24 AM
To: Zeng, Oak <[email protected]>; [email protected]
Cc: Deucher, Alexander <[email protected]>; Kuehling, Felix <[email protected]>; Keely, Sean <[email protected]>
Subject: Re: [PATCH 1/2] drm/amdgpu: Remap hdp coherency registers

Am 11.04.19 um 22:31 schrieb Zeng, Oak:

Quoted 31 lines

Remap HDP_MEM_COHERENCY_FLUSH_CNTL and HDP_REG_COHERENCY_FLUSH_CNTL to an empty page in mmio space. We will later map this page to process space so application can flush hdp. This can't be done properly at those registers' original location because it will expose more than desired registers to process space.

Change-Id Ia8d27c0c9a082711d16bbf55602bf5712a47b6d6
---
   drivers/gpu/drm/amd/amdgpu/amdgpu.h    |  6 +++++-
   drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c |  2 +-
   drivers/gpu/drm/amd/amdgpu/nbio_v6_1.h |  2 +-
   drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c |  7 +++----
   drivers/gpu/drm/amd/amdgpu/nbio_v7_0.h |  2 +-
   drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c |  7 +++----
   drivers/gpu/drm/amd/amdgpu/nbio_v7_4.h |  2 +-
   drivers/gpu/drm/amd/amdgpu/soc15.c     | 22 ++++++++++++++++++++++
   8 files changed, 37 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +3 -0
index bc96ec4..840be05 100644
@@ -644,6 +644,10 @@ struct nbio_hdp_flush_reg {
 
   struct amdgpu_nbio_funcs {
   	const struct nbio_hdp_flush_reg *hdp_flush_reg;
+	u32 remapped_hdp_mem_flush_cntl_reg_offset;
+	u32 remapped_hdp_reg_flush_cntl_reg_offset;
+	resource_size_t remapped_hdp_mem_flush_cntl_physical_addr;

drivers/gpu/drm/amd/amdgpu/amdgpu.h struct nbio_hdp_flush_reg {

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu.h +3 -1
+	resource_size_t remapped_hdp_reg_flush_cntl_physical_addr;
   	u32 (*get_hdp_flush_req_offset)(struct amdgpu_device *adev);
   	u32 (*get_hdp_flush_done_offset)(struct amdgpu_device *adev);
   	u32 (*get_pcie_index_offset)(struct amdgpu_device *adev); @@ -905,7
+909,7 @@ struct amdgpu_device {
   	/* soc15 register offset based on ip, instance and  segment */
   	uint32_t 		*reg_offset[MAX_HWIP][HWIP_MAX_INSTANCE];
 
-	const struct amdgpu_nbio_funcs	*nbio_funcs;
+	struct amdgpu_nbio_funcs	*nbio_funcs;

Please kep the function pointers constant. Those should never be changed on a running system.

Christian.

Quoted 159 lines
   	const struct amdgpu_df_funcs	*df_funcs;
   
   	/* delayed work_func for deferring clockgating during resume */
drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c +1 -1
index 6590143..2470b8e 100644
@@ -276,7 +276,7 @@ static void nbio_v6_1_init_registers(struct amdgpu_device *adev)
   		WREG32_PCIE(smnPCIE_CI_CNTL, data);
   }
 
-const struct amdgpu_nbio_funcs nbio_v6_1_funcs = {
+struct amdgpu_nbio_funcs nbio_v6_1_funcs = {
   	.hdp_flush_reg = &nbio_v6_1_hdp_flush_reg,
   	.get_hdp_flush_req_offset = nbio_v6_1_get_hdp_flush_req_offset,
   	.get_hdp_flush_done_offset = nbio_v6_1_get_hdp_flush_done_offset,
drivers/gpu/drm/amd/amdgpu/nbio_v6_1.h +1 -1
index 0743a6f..d409bb6 100644
@@ -26,6 +26,6 @@
 
   #include "soc15_common.h"
 
-extern const struct amdgpu_nbio_funcs nbio_v6_1_funcs;
+extern struct amdgpu_nbio_funcs nbio_v6_1_funcs;
 
   #endif
drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c +5 -4
index 1cdb98a..9a5abf5 100644
@@ -55,10 +55,9 @@ static void nbio_v7_0_hdp_flush(struct amdgpu_device *adev,
   				struct amdgpu_ring *ring)
   {
   	if (!ring || !ring->funcs->emit_wreg)
-		WREG32_SOC15_NO_KIQ(NBIO, 0, mmHDP_MEM_COHERENCY_FLUSH_CNTL, 0);
+		
+WREG32_NO_KIQ(adev->nbio_funcs->remapped_hdp_mem_flush_cntl_reg_offse
+t, 0);
   	else
-		amdgpu_ring_emit_wreg(ring, SOC15_REG_OFFSET(
-			NBIO, 0, mmHDP_MEM_COHERENCY_FLUSH_CNTL), 0);
+		amdgpu_ring_emit_wreg(ring,
+adev->nbio_funcs->remapped_hdp_mem_flush_cntl_reg_offset, 0);
   }
 
   static u32 nbio_v7_0_get_memsize(struct amdgpu_device *adev) @@
-263,7 +262,7 @@ static void nbio_v7_0_init_registers(struct

amdgpu_device *adev)

   }
drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c +1 -1
-const struct amdgpu_nbio_funcs nbio_v7_0_funcs = {
+struct amdgpu_nbio_funcs nbio_v7_0_funcs = {
   	.hdp_flush_reg = &nbio_v7_0_hdp_flush_reg,
   	.get_hdp_flush_req_offset = nbio_v7_0_get_hdp_flush_req_offset,
   	.get_hdp_flush_done_offset = nbio_v7_0_get_hdp_flush_done_offset,
drivers/gpu/drm/amd/amdgpu/nbio_v7_0.h +1 -1
index 508d549..db50618 100644
@@ -26,6 +26,6 @@
 
   #include "soc15_common.h"
 
-extern const struct amdgpu_nbio_funcs nbio_v7_0_funcs;
+extern struct amdgpu_nbio_funcs nbio_v7_0_funcs;
 
   #endif
drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c +6 -5
index c69d515..25203cc 100644
@@ -53,10 +53,9 @@ static void nbio_v7_4_hdp_flush(struct amdgpu_device *adev,
   				struct amdgpu_ring *ring)
   {
   	if (!ring || !ring->funcs->emit_wreg)
-		WREG32_SOC15_NO_KIQ(NBIO, 0, mmHDP_MEM_COHERENCY_FLUSH_CNTL, 0);
+		
+WREG32_NO_KIQ(adev->nbio_funcs->remapped_hdp_mem_flush_cntl_reg_offse
+t, 0);
   	else
-		amdgpu_ring_emit_wreg(ring, SOC15_REG_OFFSET(
-			NBIO, 0, mmHDP_MEM_COHERENCY_FLUSH_CNTL), 0);
+		amdgpu_ring_emit_wreg(ring,
+adev->nbio_funcs->remapped_hdp_mem_flush_cntl_reg_offset, 0);
   }
 
   static u32 nbio_v7_4_get_memsize(struct amdgpu_device *adev) @@
-242,7 +241,7 @@ static void nbio_v7_4_init_registers(struct amdgpu_device *adev)
   		WREG32_PCIE(smnPCIE_CI_CNTL, data);
   }
 
-const struct amdgpu_nbio_funcs nbio_v7_4_funcs = {
+struct amdgpu_nbio_funcs nbio_v7_4_funcs = {
   	.hdp_flush_reg = &nbio_v7_4_hdp_flush_reg,
   	.get_hdp_flush_req_offset = nbio_v7_4_get_hdp_flush_req_offset,
   	.get_hdp_flush_done_offset = nbio_v7_4_get_hdp_flush_done_offset,
drivers/gpu/drm/amd/amdgpu/nbio_v7_4.h +1 -1
index c442865..2e5bb03 100644
@@ -26,6 +26,6 @@
 
   #include "soc15_common.h"
 
-extern const struct amdgpu_nbio_funcs nbio_v7_4_funcs;
+extern struct amdgpu_nbio_funcs nbio_v7_4_funcs;
 
   #endif
drivers/gpu/drm/amd/amdgpu/soc15.c +20 -1
index bdb5ad9..c47e7a5 100644
@@ -44,6 +44,7 @@
   #include "smuio/smuio_9_0_offset.h"
   #include "smuio/smuio_9_0_sh_mask.h"
   #include "nbio/nbio_7_0_default.h"
+#include "nbio/nbio_7_0_offset.h"
   #include "nbio/nbio_7_0_sh_mask.h"
   #include "nbio/nbio_7_0_smn.h"
   #include "mp/mp_9_0_offset.h"
@@ -775,6 +776,26 @@ static const struct amdgpu_asic_funcs vega20_asic_funcs =
   	.need_reset_on_init = &soc15_need_reset_on_init,
   };
 
+static void soc15_remap_hdp_coherency_registers(struct amdgpu_device
+*adev) {
+	/* Remap hdp coherency registers to the last page of mmio
+	 * space, for the purpose of mapping them to process space(
+	 * so process can flush hdp)
+	 */
+	WREG32_SOC15(NBIO, 0, mmREMAP_HDP_MEM_FLUSH_CNTL,
+			adev->rmmio_size - PAGE_SIZE);
+	WREG32_SOC15(NBIO, 0, mmREMAP_HDP_REG_FLUSH_CNTL,
+			adev->rmmio_size - PAGE_SIZE + 4);
+	adev->nbio_funcs->remapped_hdp_mem_flush_cntl_reg_offset =
+			(adev->rmmio_size - PAGE_SIZE) >> 2;
+	adev->nbio_funcs->remapped_hdp_reg_flush_cntl_reg_offset =
+			(adev->rmmio_size - PAGE_SIZE + 4) >> 2;
+	adev->nbio_funcs->remapped_hdp_mem_flush_cntl_physical_addr =
+			adev->rmmio_base + adev->rmmio_size - PAGE_SIZE;
+	adev->nbio_funcs->remapped_hdp_reg_flush_cntl_physical_addr =
+			adev->rmmio_base + adev->rmmio_size - PAGE_SIZE + 4; }
+
   static int soc15_common_early_init(void *handle)
   {
   	struct amdgpu_device *adev = (struct amdgpu_device *)handle; @@
-794,6 +815,7 @@ static int soc15_common_early_init(void *handle)
Quoted 5 lines

drivers/gpu/drm/amd/amdgpu/soc15.c static int soc15_common_early_init(void *handle) · line 821

Quoted 5 lines
   	adev->external_rev_id = 0xFF;
drivers/gpu/drm/amd/amdgpu/soc15.c +1 -0
+	soc15_remap_hdp_coherency_registers(adev);
   	switch (adev->asic_type) {
   	case CHIP_VEGA10:
   		adev->asic_funcs = &soc15_asic_funcs;

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 677f9d24-2c03-bf30-7bb6-0e57a38f158d-5C7GfCeVMHo@public.gmane.org

author
#9 lore raw

Ok, will do it.

Regards,
Oak

-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Koenig, Christian
Sent: Monday, April 15, 2019 4:06 AM
To: Zeng, Oak <[email protected]>; [email protected]
Cc: Deucher, Alexander <[email protected]>; Kuehling, Felix <[email protected]>; Keely, Sean <[email protected]>
Subject: Re: [PATCH 1/2] drm/amdgpu: Remap hdp coherency registers

Hi Oak,

well, we make the function pointer structures constant is exactly to prevent those scenarios.

Background is that multiple GPU can use the same function pointer structure, but with different register offsets. So what you do here is actually illegal and could break in some cases.

Easiest solution would indeed be to add a new stuff directly to the adev, probably best encapsulated in a new structure.

Regards,
Christian.

Am 12.04.19 um 17:39 schrieb Zeng, Oak:

Quoted 223 lines

Hi Christian,

After hdp registers are moved to a new place in mmio space, we can't access those registers through the pre-defined register offset. I recorded the new register offset in struct amdgpu_nbio_funcs (because those registers are nbio registers) and initialized them in the early init. After those changes, I can't keep instance of struct amdgpu_nbio_funcs to be constant anymore - we don't know the new register offset before the remap function. When I made the change, I also felt not comfortable. Do you have any better solution? Introduce new r/w members directly to adev? - I also feel not comfortable because those registers I added belongs to nbio by nature...

Regards,
Oak

-----Original Message-----
From: Christian König <[email protected]>
Sent: Friday, April 12, 2019 3:24 AM
To: Zeng, Oak <[email protected]>; [email protected]
Cc: Deucher, Alexander <[email protected]>; Kuehling, Felix <[email protected]>; Keely, Sean <[email protected]>
Subject: Re: [PATCH 1/2] drm/amdgpu: Remap hdp coherency registers

Am 11.04.19 um 22:31 schrieb Zeng, Oak:

Quoted 32 lines

Remap HDP_MEM_COHERENCY_FLUSH_CNTL and HDP_REG_COHERENCY_FLUSH_CNTL to an empty page in mmio space. We will later map this page to process space so application can flush hdp. This can't be done properly at those registers' original location because it will expose more than desired registers to process space.

Change-Id Ia8d27c0c9a082711d16bbf55602bf5712a47b6d6
---
   drivers/gpu/drm/amd/amdgpu/amdgpu.h    |  6 +++++-
   drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c |  2 +-
   drivers/gpu/drm/amd/amdgpu/nbio_v6_1.h |  2 +-
   drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c |  7 +++----
   drivers/gpu/drm/amd/amdgpu/nbio_v7_0.h |  2 +-
   drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c |  7 +++----
   drivers/gpu/drm/amd/amdgpu/nbio_v7_4.h |  2 +-
   drivers/gpu/drm/amd/amdgpu/soc15.c     | 22 ++++++++++++++++++++++
   8 files changed, 37 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +4 -0
index bc96ec4..840be05 100644
@@ -644,6 +644,10 @@ struct nbio_hdp_flush_reg {
 
   struct amdgpu_nbio_funcs {
   	const struct nbio_hdp_flush_reg *hdp_flush_reg;
+	u32 remapped_hdp_mem_flush_cntl_reg_offset;
+	u32 remapped_hdp_reg_flush_cntl_reg_offset;
+	resource_size_t remapped_hdp_mem_flush_cntl_physical_addr;
+	resource_size_t remapped_hdp_reg_flush_cntl_physical_addr;

drivers/gpu/drm/amd/amdgpu/amdgpu.h struct nbio_hdp_flush_reg {

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu.h +2 -2
   	u32 (*get_hdp_flush_req_offset)(struct amdgpu_device *adev);
   	u32 (*get_hdp_flush_done_offset)(struct amdgpu_device *adev);
   	u32 (*get_pcie_index_offset)(struct amdgpu_device *adev); @@ 
-905,7
+909,7 @@ struct amdgpu_device {
   	/* soc15 register offset based on ip, instance and  segment */
   	uint32_t 		*reg_offset[MAX_HWIP][HWIP_MAX_INSTANCE];
 
-	const struct amdgpu_nbio_funcs	*nbio_funcs;
+	struct amdgpu_nbio_funcs	*nbio_funcs;

Please kep the function pointers constant. Those should never be changed on a running system.

Christian.

Quoted 161 lines
   	const struct amdgpu_df_funcs	*df_funcs;
   
   	/* delayed work_func for deferring clockgating during resume */ 
drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c +1 -1
index 6590143..2470b8e 100644
@@ -276,7 +276,7 @@ static void nbio_v6_1_init_registers(struct amdgpu_device *adev)
   		WREG32_PCIE(smnPCIE_CI_CNTL, data);
   }
 
-const struct amdgpu_nbio_funcs nbio_v6_1_funcs = {
+struct amdgpu_nbio_funcs nbio_v6_1_funcs = {
   	.hdp_flush_reg = &nbio_v6_1_hdp_flush_reg,
   	.get_hdp_flush_req_offset = nbio_v6_1_get_hdp_flush_req_offset,
   	.get_hdp_flush_done_offset = nbio_v6_1_get_hdp_flush_done_offset,
drivers/gpu/drm/amd/amdgpu/nbio_v6_1.h +1 -1
index 0743a6f..d409bb6 100644
@@ -26,6 +26,6 @@
 
   #include "soc15_common.h"
 
-extern const struct amdgpu_nbio_funcs nbio_v6_1_funcs;
+extern struct amdgpu_nbio_funcs nbio_v6_1_funcs;
 
   #endif
drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c +6 -4
index 1cdb98a..9a5abf5 100644
@@ -55,10 +55,9 @@ static void nbio_v7_0_hdp_flush(struct amdgpu_device *adev,
   				struct amdgpu_ring *ring)
   {
   	if (!ring || !ring->funcs->emit_wreg)
-		WREG32_SOC15_NO_KIQ(NBIO, 0, mmHDP_MEM_COHERENCY_FLUSH_CNTL, 0);
+		
+WREG32_NO_KIQ(adev->nbio_funcs->remapped_hdp_mem_flush_cntl_reg_offs
+e
+t, 0);
   	else
-		amdgpu_ring_emit_wreg(ring, SOC15_REG_OFFSET(
-			NBIO, 0, mmHDP_MEM_COHERENCY_FLUSH_CNTL), 0);
+		amdgpu_ring_emit_wreg(ring,
+adev->nbio_funcs->remapped_hdp_mem_flush_cntl_reg_offset, 0);
   }
 
   static u32 nbio_v7_0_get_memsize(struct amdgpu_device *adev) @@
-263,7 +262,7 @@ static void nbio_v7_0_init_registers(struct 

amdgpu_device *adev)

   }
drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c +1 -1
-const struct amdgpu_nbio_funcs nbio_v7_0_funcs = {
+struct amdgpu_nbio_funcs nbio_v7_0_funcs = {
   	.hdp_flush_reg = &nbio_v7_0_hdp_flush_reg,
   	.get_hdp_flush_req_offset = nbio_v7_0_get_hdp_flush_req_offset,
   	.get_hdp_flush_done_offset = nbio_v7_0_get_hdp_flush_done_offset,
drivers/gpu/drm/amd/amdgpu/nbio_v7_0.h +1 -1
index 508d549..db50618 100644
@@ -26,6 +26,6 @@
 
   #include "soc15_common.h"
 
-extern const struct amdgpu_nbio_funcs nbio_v7_0_funcs;
+extern struct amdgpu_nbio_funcs nbio_v7_0_funcs;
 
   #endif
drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c +7 -5
index c69d515..25203cc 100644
@@ -53,10 +53,9 @@ static void nbio_v7_4_hdp_flush(struct amdgpu_device *adev,
   				struct amdgpu_ring *ring)
   {
   	if (!ring || !ring->funcs->emit_wreg)
-		WREG32_SOC15_NO_KIQ(NBIO, 0, mmHDP_MEM_COHERENCY_FLUSH_CNTL, 0);
+		
+WREG32_NO_KIQ(adev->nbio_funcs->remapped_hdp_mem_flush_cntl_reg_offs
+e
+t, 0);
   	else
-		amdgpu_ring_emit_wreg(ring, SOC15_REG_OFFSET(
-			NBIO, 0, mmHDP_MEM_COHERENCY_FLUSH_CNTL), 0);
+		amdgpu_ring_emit_wreg(ring,
+adev->nbio_funcs->remapped_hdp_mem_flush_cntl_reg_offset, 0);
   }
 
   static u32 nbio_v7_4_get_memsize(struct amdgpu_device *adev) @@
-242,7 +241,7 @@ static void nbio_v7_4_init_registers(struct amdgpu_device *adev)
   		WREG32_PCIE(smnPCIE_CI_CNTL, data);
   }
 
-const struct amdgpu_nbio_funcs nbio_v7_4_funcs = {
+struct amdgpu_nbio_funcs nbio_v7_4_funcs = {
   	.hdp_flush_reg = &nbio_v7_4_hdp_flush_reg,
   	.get_hdp_flush_req_offset = nbio_v7_4_get_hdp_flush_req_offset,
   	.get_hdp_flush_done_offset = nbio_v7_4_get_hdp_flush_done_offset,
drivers/gpu/drm/amd/amdgpu/nbio_v7_4.h +1 -1
index c442865..2e5bb03 100644
@@ -26,6 +26,6 @@
 
   #include "soc15_common.h"
 
-extern const struct amdgpu_nbio_funcs nbio_v7_4_funcs;
+extern struct amdgpu_nbio_funcs nbio_v7_4_funcs;
 
   #endif
drivers/gpu/drm/amd/amdgpu/soc15.c +20 -1
index bdb5ad9..c47e7a5 100644
@@ -44,6 +44,7 @@
   #include "smuio/smuio_9_0_offset.h"
   #include "smuio/smuio_9_0_sh_mask.h"
   #include "nbio/nbio_7_0_default.h"
+#include "nbio/nbio_7_0_offset.h"
   #include "nbio/nbio_7_0_sh_mask.h"
   #include "nbio/nbio_7_0_smn.h"
   #include "mp/mp_9_0_offset.h"
@@ -775,6 +776,26 @@ static const struct amdgpu_asic_funcs vega20_asic_funcs =
   	.need_reset_on_init = &soc15_need_reset_on_init,
   };
 
+static void soc15_remap_hdp_coherency_registers(struct amdgpu_device
+*adev) {
+	/* Remap hdp coherency registers to the last page of mmio
+	 * space, for the purpose of mapping them to process space(
+	 * so process can flush hdp)
+	 */
+	WREG32_SOC15(NBIO, 0, mmREMAP_HDP_MEM_FLUSH_CNTL,
+			adev->rmmio_size - PAGE_SIZE);
+	WREG32_SOC15(NBIO, 0, mmREMAP_HDP_REG_FLUSH_CNTL,
+			adev->rmmio_size - PAGE_SIZE + 4);
+	adev->nbio_funcs->remapped_hdp_mem_flush_cntl_reg_offset =
+			(adev->rmmio_size - PAGE_SIZE) >> 2;
+	adev->nbio_funcs->remapped_hdp_reg_flush_cntl_reg_offset =
+			(adev->rmmio_size - PAGE_SIZE + 4) >> 2;
+	adev->nbio_funcs->remapped_hdp_mem_flush_cntl_physical_addr =
+			adev->rmmio_base + adev->rmmio_size - PAGE_SIZE;
+	adev->nbio_funcs->remapped_hdp_reg_flush_cntl_physical_addr =
+			adev->rmmio_base + adev->rmmio_size - PAGE_SIZE + 4; }
+
   static int soc15_common_early_init(void *handle)
   {
   	struct amdgpu_device *adev = (struct amdgpu_device *)handle; @@
-794,6 +815,7 @@ static int soc15_common_early_init(void *handle)
Quoted 5 lines

drivers/gpu/drm/amd/amdgpu/soc15.c

Quoted 5 lines
   	adev->external_rev_id = 0xFF;
drivers/gpu/drm/amd/amdgpu/soc15.c +1 -0
+	soc15_remap_hdp_coherency_registers(adev);
   	switch (adev->asic_type) {
   	case CHIP_VEGA10:
   		adev->asic_funcs = &soc15_asic_funcs;

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx