[PATCH 00/10] drm/amdkfd: introduce the kfd support for Renoir

[PATCH 00/10] drm/amdkfd: introduce the kfd support for Renoir

[Huang, Ray]

Hi all,

These patch set provides the kfd support for ROCm stack on Renoir APU.

Thanks,
Ray

Huang Rui (10):
  drm/amdkfd: add renoir cache info for CRAT
  drm/amdkfd: add renoir kfd device info
  drm/amdkfd: enable kfd device queue manager v9 for renoir
  drm/amdkfd: add renoir typs for the workaround of iommu v2
  drm/amdkfd: init kfd apertures v9 for renoir
  drm/amdkfd: init kernel queue for renoir
  drm/amdkfd: add package manager for renoir
  drm/amdkfd: add renoir kfd topology
  drm/amdgpu: disable gfxoff while use no H/W scheduling policy
  drm/amdkfd: enable renoir while device probes

 drivers/gpu/drm/amd/amdgpu/amdgpu.h                   |  1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c            |  1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c            |  2 +-
 drivers/gpu/drm/amd/amdkfd/kfd_crat.c                 |  4 ++++
 drivers/gpu/drm/amd/amdkfd/kfd_device.c               | 19 +++++++++++++++++++
 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c |  1 +
 drivers/gpu/drm/amd/amdkfd/kfd_events.c               |  3 ++-
 drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c          |  1 +
 drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c         |  1 +
 drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c       |  1 +
 drivers/gpu/drm/amd/amdkfd/kfd_topology.c             |  1 +
 11 files changed, 33 insertions(+), 2 deletions(-)

-- 
2.7.4

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

[PATCH 01/10] drm/amdkfd: add renoir cache info for CRAT

[Huang, Ray]

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

Signed-off-by: Huang Rui <ray.huang@amd.com>
---
 drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
index a84c810..2a428c9 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
@@ -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
 
@@ -668,6 +669,9 @@ static int kfd_fill_gpu_cache_info(struct kfd_dev *kdev,
 	case CHIP_RAVEN:
 		pcache_info = raven_cache_info;
 		num_of_cache_types = ARRAY_SIZE(raven_cache_info);
+	case CHIP_RENOIR:
+		pcache_info = renoir_cache_info;
+		num_of_cache_types = ARRAY_SIZE(renoir_cache_info);
 	case CHIP_NAVI10:
 		pcache_info = navi10_cache_info;
 		num_of_cache_types = ARRAY_SIZE(navi10_cache_info);
-- 
2.7.4

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

[PATCH 02/10] drm/amdkfd: add renoir kfd device info

[Huang, 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.

Signed-off-by: Huang Rui <ray.huang@amd.com>
---
 drivers/gpu/drm/amd/amdkfd/kfd_device.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
index 2514263..1f65585 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
@@ -317,6 +317,23 @@ static const struct kfd_device_info vega20_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,
 	.max_pasid_bits = 16,
@@ -452,6 +469,8 @@ static const struct kfd_deviceid supported_devices[] = {
 	{ 0x66a4, &vega20_device_info },	/* Vega20 */
 	{ 0x66a7, &vega20_device_info },	/* Vega20 */
 	{ 0x66af, &vega20_device_info },	/* Vega20 */
+	/* Renoir */
+	{ 0x1636, &renoir_device_info },	/* Renoir */
 	/* Navi10 */
 	{ 0x7310, &navi10_device_info },	/* Navi10 */
 	{ 0x7312, &navi10_device_info },	/* Navi10 */
-- 
2.7.4

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

[PATCH 03/10] drm/amdkfd: enable kfd device queue manager v9 for renoir

[Huang, Ray]

Renoir is GFX9, so enable v9 devcie queue manager.

Signed-off-by: Huang Rui <ray.huang@amd.com>
---
 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
index 07caeda..dc959da 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
@@ -1848,6 +1848,7 @@ struct device_queue_manager *device_queue_manager_init(struct kfd_dev *dev)
 	case CHIP_VEGA12:
 	case CHIP_VEGA20:
 	case CHIP_RAVEN:
+	case CHIP_RENOIR:
 		device_queue_manager_init_v9(&dqm->asic_ops);
 		break;
 	case CHIP_NAVI10:
-- 
2.7.4

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

[PATCH 04/10] drm/amdkfd: add renoir typs for the workaround of iommu v2

[Huang, Ray]

Renoir is the same with Raven, will enable iommu event in future.

Signed-off-by: Huang Rui <ray.huang@amd.com>
---
 drivers/gpu/drm/amd/amdkfd/kfd_events.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_events.c b/drivers/gpu/drm/amd/amdkfd/kfd_events.c
index 3e22fa3..bb3a642 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_events.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_events.c
@@ -987,7 +987,8 @@ void kfd_signal_iommu_event(struct kfd_dev *dev, unsigned int pasid,
 	 * before IOMMU is able to finish processing all the excessive PPRs
 	 * triggered due to HW flaws.
 	 */
-	if (dev->device_info->asic_family != CHIP_RAVEN) {
+	if (dev->device_info->asic_family != CHIP_RAVEN ||
+	    dev->device_info->asic_family != CHIP_RENOIR) {
 		mutex_lock(&p->event_mutex);
 
 		/* Lookup events by type and signal them */
-- 
2.7.4

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

[PATCH 05/10] drm/amdkfd: init kfd apertures v9 for renoir

[Huang, Ray]

Renoir is GMC v9, so init v9 kfd apertures.

Signed-off-by: Huang Rui <ray.huang@amd.com>
---
 drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c b/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c
index 7a5b3b2..989c74f 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c
@@ -410,6 +410,7 @@ int kfd_init_apertures(struct kfd_process *process)
 			case CHIP_VEGA12:
 			case CHIP_VEGA20:
 			case CHIP_RAVEN:
+			case CHIP_RENOIR:
 			case CHIP_NAVI10:
 				kfd_init_apertures_v9(pdd, id);
 				break;
-- 
2.7.4

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

[PATCH 06/10] drm/amdkfd: init kernel queue for renoir

[Huang, Ray]

Renoir is GFX v9, so init v9 kernel queue.

Signed-off-by: Huang Rui <ray.huang@amd.com>
---
 drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c
index 26c66bb..2462d24 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c
@@ -364,6 +364,7 @@ struct kernel_queue *kernel_queue_init(struct kfd_dev *dev,
 	case CHIP_VEGA12:
 	case CHIP_VEGA20:
 	case CHIP_RAVEN:
+	case CHIP_RENOIR:
 		kernel_queue_init_v9(&kq->ops_asic_specific);
 		break;
 	case CHIP_NAVI10:
-- 
2.7.4

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

[PATCH 07/10] drm/amdkfd: add package manager for renoir

[Huang, Ray]

Renoir use GFX v9, so adds v9 package manager.

Signed-off-by: Huang Rui <ray.huang@amd.com>
---
 drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c
index 3ff34e9..892b285 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c
@@ -235,6 +235,7 @@ int pm_init(struct packet_manager *pm, struct device_queue_manager *dqm)
 	case CHIP_VEGA12:
 	case CHIP_VEGA20:
 	case CHIP_RAVEN:
+	case CHIP_RENOIR:
 		pm->pmf = &kfd_v9_pm_funcs;
 		break;
 	case CHIP_NAVI10:
-- 
2.7.4

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

[PATCH 08/10] drm/amdkfd: add renoir kfd topology

[Huang, Ray]

This patch adds renoir kfd topology which is the same with Raven.

Signed-off-by: Huang Rui <ray.huang@amd.com>
---
 drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
index 43fe920..d52f93a 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
@@ -1417,6 +1417,7 @@ int kfd_topology_add_device(struct kfd_dev *gpu)
 	case CHIP_VEGA12:
 	case CHIP_VEGA20:
 	case CHIP_RAVEN:
+	case CHIP_RENOIR:
 	case CHIP_NAVI10:
 		dev->node_props.capability |= ((HSA_CAP_DOORBELL_TYPE_2_0 <<
 			HSA_CAP_DOORBELL_TYPE_TOTALBITS_SHIFT) &
-- 
2.7.4

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

[PATCH 09/10] drm/amdgpu: disable gfxoff while use no H/W scheduling policy

[Huang, Ray]

While gfxoff is enabled, the mmVM_XXX registers will be 0xfffffff while the GFX
is in "off" state. KFD queue creattion doesn't use ring based method, so it will
trigger a VM fault.

Signed-off-by: Huang Rui <ray.huang@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu.h        | 1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 3e86207..b6721a6 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -167,6 +167,7 @@ extern int amdgpu_async_gfx_ring;
 extern int amdgpu_mcbp;
 extern int amdgpu_discovery;
 extern int amdgpu_mes;
+extern int sched_policy;
 
 #ifdef CONFIG_DRM_AMDGPU_SI
 extern int amdgpu_si_support;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index dd219a5..34f371d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -1576,7 +1576,7 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev)
 	}
 
 	adev->pm.pp_feature = amdgpu_pp_feature_mask;
-	if (amdgpu_sriov_vf(adev))
+	if (amdgpu_sriov_vf(adev) || sched_policy == KFD_SCHED_POLICY_NO_HWS)
 		adev->pm.pp_feature &= ~PP_GFXOFF_MASK;
 
 	for (i = 0; i < adev->num_ip_blocks; i++) {
-- 
2.7.4

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

[PATCH 10/10] drm/amdkfd: enable renoir while device probes

[Huang, Ray]

This patch is to add asic flag to enable device probe during kfd init.

Signed-off-by: Huang Rui <ray.huang@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
index 3dfd9de..51687af8 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
@@ -90,6 +90,7 @@ void amdgpu_amdkfd_device_probe(struct amdgpu_device *adev)
 	case CHIP_VEGA12:
 	case CHIP_VEGA20:
 	case CHIP_RAVEN:
+	case CHIP_RENOIR:
 #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0) && defined(BUILD_AS_DKMS)
 		if (adev->asic_type == CHIP_RAVEN) {
 			dev_dbg(adev->dev, "DKMS installed kfd does not support Raven for kernel < 4.16\n");
-- 
2.7.4

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

Re: [PATCH 01/10] drm/amdkfd: add renoir cache info for CRAT

[Kuehling, Felix]

On 2019-09-04 11:48 a.m., Huang, Ray wrote:
> Renoir's cache info should be the same with raven and carrizo's.
>
> Signed-off-by: Huang Rui <ray.huang@amd.com>
> ---
>   drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 4 ++++
>   1 file changed, 4 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
> index a84c810..2a428c9 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
> @@ -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
>   
> @@ -668,6 +669,9 @@ static int kfd_fill_gpu_cache_info(struct kfd_dev *kdev,
>   	case CHIP_RAVEN:
>   		pcache_info = raven_cache_info;
>   		num_of_cache_types = ARRAY_SIZE(raven_cache_info);
> +	case CHIP_RENOIR:
> +		pcache_info = renoir_cache_info;
> +		num_of_cache_types = ARRAY_SIZE(renoir_cache_info);

I just noticed, there are break; statements missing here. Which branch 
are your changes based on? At least the surrounding code looks OK on 
amd-staging-drm-next, but seems to be missing a break statement at least 
in the Raven case here.

Regards,
   Felix


>   	case CHIP_NAVI10:
>   		pcache_info = navi10_cache_info;
>   		num_of_cache_types = ARRAY_SIZE(navi10_cache_info);
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

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

[Kuehling, Felix]

On 2019-09-04 11:48 a.m., Huang, Ray wrote:
> 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.
>
> Signed-off-by: Huang Rui <ray.huang@amd.com>

Looks good, but please coordinate with Yong who is changing the 
structure of the kfd device info table. See his patch "drm/amdkfd: Query 
kfd device info by CHIP id instead of pci device id" for details. 
Whoever goes in second will need to rebase and fix the conflict.

Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>


> ---
>   drivers/gpu/drm/amd/amdkfd/kfd_device.c | 19 +++++++++++++++++++
>   1 file changed, 19 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> index 2514263..1f65585 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> @@ -317,6 +317,23 @@ static const struct kfd_device_info vega20_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,
>   	.max_pasid_bits = 16,
> @@ -452,6 +469,8 @@ static const struct kfd_deviceid supported_devices[] = {
>   	{ 0x66a4, &vega20_device_info },	/* Vega20 */
>   	{ 0x66a7, &vega20_device_info },	/* Vega20 */
>   	{ 0x66af, &vega20_device_info },	/* Vega20 */
> +	/* Renoir */
> +	{ 0x1636, &renoir_device_info },	/* Renoir */
>   	/* Navi10 */
>   	{ 0x7310, &navi10_device_info },	/* Navi10 */
>   	{ 0x7312, &navi10_device_info },	/* Navi10 */
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 00/10] drm/amdkfd: introduce the kfd support for Renoir

[Kuehling, Felix]

Patches 2-10 are

Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>

See my comments on patches 1 and 2 in separate emails. In patch 1 it 
looks like you're based on an outdated version of the branch or a 
different branch altogether. Please check that your series is based on 
the latest amd-staging-drm-next.

Regards,
   Felix

On 2019-09-04 11:48 a.m., Huang, Ray wrote:
> Hi all,
>
> These patch set provides the kfd support for ROCm stack on Renoir APU.
>
> Thanks,
> Ray
>
> Huang Rui (10):
>    drm/amdkfd: add renoir cache info for CRAT
>    drm/amdkfd: add renoir kfd device info
>    drm/amdkfd: enable kfd device queue manager v9 for renoir
>    drm/amdkfd: add renoir typs for the workaround of iommu v2
>    drm/amdkfd: init kfd apertures v9 for renoir
>    drm/amdkfd: init kernel queue for renoir
>    drm/amdkfd: add package manager for renoir
>    drm/amdkfd: add renoir kfd topology
>    drm/amdgpu: disable gfxoff while use no H/W scheduling policy
>    drm/amdkfd: enable renoir while device probes
>
>   drivers/gpu/drm/amd/amdgpu/amdgpu.h                   |  1 +
>   drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c            |  1 +
>   drivers/gpu/drm/amd/amdgpu/amdgpu_device.c            |  2 +-
>   drivers/gpu/drm/amd/amdkfd/kfd_crat.c                 |  4 ++++
>   drivers/gpu/drm/amd/amdkfd/kfd_device.c               | 19 +++++++++++++++++++
>   drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c |  1 +
>   drivers/gpu/drm/amd/amdkfd/kfd_events.c               |  3 ++-
>   drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c          |  1 +
>   drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c         |  1 +
>   drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c       |  1 +
>   drivers/gpu/drm/amd/amdkfd/kfd_topology.c             |  1 +
>   11 files changed, 33 insertions(+), 2 deletions(-)
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 00/10] drm/amdkfd: introduce the kfd support for Renoir

[Huang, Ray]

On Thu, Sep 05, 2019 at 03:42:50AM +0800, Kuehling, Felix wrote:
> Patches 2-10 are
> 
> Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
> 
> See my comments on patches 1 and 2 in separate emails. In patch 1 it 
> looks like you're based on an outdated version of the branch or a 
> different branch altogether. Please check that your series is based on 
> the latest amd-staging-drm-next.
> 

I will rebase them to drm-next before submit.

Thanks,
Ray

> Regards,
>    Felix
> 
> On 2019-09-04 11:48 a.m., Huang, Ray wrote:
> > Hi all,
> >
> > These patch set provides the kfd support for ROCm stack on Renoir APU.
> >
> > Thanks,
> > Ray
> >
> > Huang Rui (10):
> >    drm/amdkfd: add renoir cache info for CRAT
> >    drm/amdkfd: add renoir kfd device info
> >    drm/amdkfd: enable kfd device queue manager v9 for renoir
> >    drm/amdkfd: add renoir typs for the workaround of iommu v2
> >    drm/amdkfd: init kfd apertures v9 for renoir
> >    drm/amdkfd: init kernel queue for renoir
> >    drm/amdkfd: add package manager for renoir
> >    drm/amdkfd: add renoir kfd topology
> >    drm/amdgpu: disable gfxoff while use no H/W scheduling policy
> >    drm/amdkfd: enable renoir while device probes
> >
> >   drivers/gpu/drm/amd/amdgpu/amdgpu.h                   |  1 +
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c            |  1 +
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_device.c            |  2 +-
> >   drivers/gpu/drm/amd/amdkfd/kfd_crat.c                 |  4 ++++
> >   drivers/gpu/drm/amd/amdkfd/kfd_device.c               | 19 +++++++++++++++++++
> >   drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c |  1 +
> >   drivers/gpu/drm/amd/amdkfd/kfd_events.c               |  3 ++-
> >   drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c          |  1 +
> >   drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c         |  1 +
> >   drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c       |  1 +
> >   drivers/gpu/drm/amd/amdkfd/kfd_topology.c             |  1 +
> >   11 files changed, 33 insertions(+), 2 deletions(-)
> >
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 01/10] drm/amdkfd: add renoir cache info for CRAT

[Huang, Ray]

On Thu, Sep 05, 2019 at 03:35:20AM +0800, Kuehling, Felix wrote:
> On 2019-09-04 11:48 a.m., Huang, Ray wrote:
> > Renoir's cache info should be the same with raven and carrizo's.
> >
> > Signed-off-by: Huang Rui <ray.huang@amd.com>
> > ---
> >   drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 4 ++++
> >   1 file changed, 4 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
> > index a84c810..2a428c9 100644
> > --- a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
> > +++ b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
> > @@ -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
> >   
> > @@ -668,6 +669,9 @@ static int kfd_fill_gpu_cache_info(struct kfd_dev *kdev,
> >   	case CHIP_RAVEN:
> >   		pcache_info = raven_cache_info;
> >   		num_of_cache_types = ARRAY_SIZE(raven_cache_info);
> > +	case CHIP_RENOIR:
> > +		pcache_info = renoir_cache_info;
> > +		num_of_cache_types = ARRAY_SIZE(renoir_cache_info);
> 
> I just noticed, there are break; statements missing here. Which branch 
> are your changes based on? At least the surrounding code looks OK on 
> amd-staging-drm-next, but seems to be missing a break statement at least 
> in the Raven case here.
> 

Thanks to catch this. I will re-send v2 patch later.

Thanks,
Ray

> Regards,
>    Felix
> 
> 
> >   	case CHIP_NAVI10:
> >   		pcache_info = navi10_cache_info;
> >   		num_of_cache_types = ARRAY_SIZE(navi10_cache_info);
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

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

[Huang, Ray]

On Thu, Sep 05, 2019 at 03:38:31AM +0800, Kuehling, Felix wrote:
> On 2019-09-04 11:48 a.m., Huang, Ray wrote:
> > 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.
> >
> > Signed-off-by: Huang Rui <ray.huang@amd.com>
> 
> Looks good, but please coordinate with Yong who is changing the 
> structure of the kfd device info table. See his patch "drm/amdkfd: Query 
> kfd device info by CHIP id instead of pci device id" for details. 
> Whoever goes in second will need to rebase and fix the conflict.

Talked with Yong, he has submitted the patch to drm-next.
I will rebase the patch.

Thanks,
Ray

> 
> Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
> 
> 
> > ---
> >   drivers/gpu/drm/amd/amdkfd/kfd_device.c | 19 +++++++++++++++++++
> >   1 file changed, 19 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> > index 2514263..1f65585 100644
> > --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> > +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> > @@ -317,6 +317,23 @@ static const struct kfd_device_info vega20_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,
> >   	.max_pasid_bits = 16,
> > @@ -452,6 +469,8 @@ static const struct kfd_deviceid supported_devices[] = {
> >   	{ 0x66a4, &vega20_device_info },	/* Vega20 */
> >   	{ 0x66a7, &vega20_device_info },	/* Vega20 */
> >   	{ 0x66af, &vega20_device_info },	/* Vega20 */
> > +	/* Renoir */
> > +	{ 0x1636, &renoir_device_info },	/* Renoir */
> >   	/* Navi10 */
> >   	{ 0x7310, &navi10_device_info },	/* Navi10 */
> >   	{ 0x7312, &navi10_device_info },	/* Navi10 */
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx