Skip to contentSkip to conversation

drm/amdkfd: add renoir cache info for CRAT (v2)

PATCH In review Huang, Ray 2 participants 3 messages Sep 5, 2019 2 messages not in the archive

Subsystems (3)
lore
Share & tools
lore

Huang, Ray

author
#0 lore raw

PATCH v2 1/10 drm/amdkfd: add renoir cache info for CRAT (v2)

Renoir's cache info should be the same with raven and carrizo's.

v2: fix missed "break"

---
 drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 5 +++++
 1 file changed, 5 insertions(+)
drivers/gpu/drm/amd/amdkfd/kfd_crat.c +5 -0
index 66387ca..b115a01 100644
@@ -138,6 +138,7 @@ static struct kfd_gpu_cache_info carrizo_cache_info[] = {
 /* TODO - check & update Vega10 cache details */
 #define vega10_cache_info carrizo_cache_info
 #define raven_cache_info carrizo_cache_info
+#define renoir_cache_info carrizo_cache_info
 /* TODO - check & update Navi10 cache details */
 #define navi10_cache_info carrizo_cache_info
 
@@ -670,6 +671,10 @@ static int kfd_fill_gpu_cache_info(struct kfd_dev *kdev,
 		pcache_info = raven_cache_info;
 		num_of_cache_types = ARRAY_SIZE(raven_cache_info);
 		break;
+	case CHIP_RENOIR:
+		pcache_info = renoir_cache_info;
+		num_of_cache_types = ARRAY_SIZE(renoir_cache_info);
+		break;
 	case CHIP_NAVI10:
 		pcache_info = navi10_cache_info;
 		num_of_cache_types = ARRAY_SIZE(navi10_cache_info);
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): 1567708597-18831-1-git-send-email-ray.huang-5C7GfCeVMHo@public.gmane.org

author
#2 lore raw

PATCH v2 2/10 drm/amdkfd: add renoir kfd device info (v2)

This patch inits renoir kfd device info, so we treat renoir as "dgpu" (bypass iommu v2). Will enable needs_iommu_device till renoir iommu is ready.

v2: rebase and align the drm-next

---
 drivers/gpu/drm/amd/amdkfd/kfd_device.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
drivers/gpu/drm/amd/amdkfd/kfd_device.c +18 -0
index 267eb2e..c5120f3 100644
@@ -351,6 +351,23 @@ static const struct kfd_device_info arcturus_device_info = {
 	.num_sdma_queues_per_engine = 8,
 };
 
+static const struct kfd_device_info renoir_device_info = {
+	.asic_family = CHIP_RENOIR,
+	.max_pasid_bits = 16,
+	.max_no_of_hqd  = 24,
+	.doorbell_size  = 8,
+	.ih_ring_entry_size = 8 * sizeof(uint32_t),
+	.event_interrupt_class = &event_interrupt_class_v9,
+	.num_of_watch_points = 4,
+	.mqd_size_aligned = MQD_SIZE_ALIGNED,
+	.supports_cwsr = true,
+	.needs_iommu_device = false,
+	.needs_pci_atomics = false,
+	.num_sdma_engines = 1,
+	.num_xgmi_sdma_engines = 0,
+	.num_sdma_queues_per_engine = 2,
+};
+
 static const struct kfd_device_info navi10_device_info = {
 	.asic_family = CHIP_NAVI10,
 	.asic_name = "navi10",
@@ -384,6 +401,7 @@ static const struct kfd_device_info *kfd_supported_devices[][2] = {
 	[CHIP_VEGA12] = {&vega12_device_info, NULL},
 	[CHIP_VEGA20] = {&vega20_device_info, NULL},
 	[CHIP_RAVEN] = {&raven_device_info, NULL},
+	[CHIP_RENOIR] = {&renoir_device_info, NULL},
 	[CHIP_ARCTURUS] = {&arcturus_device_info, &arcturus_device_info},
 	[CHIP_NAVI10] = {&navi10_device_info, NULL},
 };
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): 1567708597-18831-2-git-send-email-ray.huang-5C7GfCeVMHo@public.gmane.org

Reviewed-by Felix Kuehling
#4 lore raw

Re: [PATCH v2 02/10] drm/amdkfd: add renoir kfd device info (v2)

Quoted 6 lines · Ray

This patch inits renoir kfd device info, so we treat renoir as "dgpu" (bypass iommu v2). Will enable needs_iommu_device till renoir iommu is ready.

v2: rebase and align the drm-next

The series is

Note that you'll need to rebase this patch again after Yong's fix for builds without IOMMUv2 support. The CHIP_RAVEN entry in the device table moved. CHIP_RENOIR should stay where it is, because for now Renoir support doesn't depend on IOMMUv2.

Regards,
  Felix

Quoted 33 lines
---
  drivers/gpu/drm/amd/amdkfd/kfd_device.c | 18 ++++++++++++++++++
  1 file changed, 18 insertions(+)
drivers/gpu/drm/amd/amdkfd/kfd_device.c +17 -0
index 267eb2e..c5120f3 100644
@@ -351,6 +351,23 @@ static const struct kfd_device_info arcturus_device_info = {
  	.num_sdma_queues_per_engine = 8,
  };
 
+static const struct kfd_device_info renoir_device_info = {
+	.asic_family = CHIP_RENOIR,
+	.max_pasid_bits = 16,
+	.max_no_of_hqd  = 24,
+	.doorbell_size  = 8,
+	.ih_ring_entry_size = 8 * sizeof(uint32_t),
+	.event_interrupt_class = &event_interrupt_class_v9,
+	.num_of_watch_points = 4,
+	.mqd_size_aligned = MQD_SIZE_ALIGNED,
+	.supports_cwsr = true,
+	.needs_iommu_device = false,
+	.needs_pci_atomics = false,
+	.num_sdma_engines = 1,
+	.num_xgmi_sdma_engines = 0,
+	.num_sdma_queues_per_engine = 2,
+};
+
  static const struct kfd_device_info navi10_device_info = {
  	.asic_family = CHIP_NAVI10,
  	.asic_name = "navi10",

drivers/gpu/drm/amd/amdkfd/kfd_device.c static const struct kfd_device_info *kfd_supported_devices[][2] = { · line 407

Quoted 7 lines
drivers/gpu/drm/amd/amdkfd/kfd_device.c +1 -0
@@ -384,6 +401,7 @@ static const struct kfd_device_info *kfd_supported_devices[][2] = {
  	[CHIP_VEGA12] = {&vega12_device_info, NULL},
  	[CHIP_VEGA20] = {&vega20_device_info, NULL},
  	[CHIP_RAVEN] = {&raven_device_info, NULL},
+	[CHIP_RENOIR] = {&renoir_device_info, NULL},
  	[CHIP_ARCTURUS] = {&arcturus_device_info, &arcturus_device_info},
  	[CHIP_NAVI10] = {&navi10_device_info, NULL},
  };

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