<html> <head> <meta http-equiv="Content-Type" content="text/html; charset=us-ascii"> <style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style> </head> <body dir="ltr"> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> If Navi12 is the same as Navi10, then you can easily add the KFD support first, as it only involves a couple of lines because of recent simplification. Then have this patch next. </div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> <br> </div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> Regards,</div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> Yong</div> <div id="appendonsend"></div> <hr style="display:inline-block;width:98%" tabindex="-1"> <div id="divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" style="font-size:11pt" color="#000000"><b>From:</b> Liu, Shaoyun <Shaoyun.Liu@amd.com><br> <b>Sent:</b> Tuesday, September 24, 2019 6:28 PM<br> <b>To:</b> Zhao, Yong <Yong.Zhao@amd.com>; amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org><br> <b>Subject:</b> Re: [PATCH] drm/amdkfd: Add NAVI12 support from kfd side</font> <div> </div> </div> <div style="background-color:#FFFFFF"> <p>I will push to drm-next branch . After check the code again , this change will cause issue in the kfd since CHIP_NAVI12 not added in other place where check the device_info->asic_family in kfd code . I think it's better just set the family ID as CHIP_NAVI10 since there is no difference from the kfd side for NAVI10, NAVI12 and NAVI14. I will send another review . <br> </p> <p><br> </p> <p>Regards</p> <p>shaoyun.liu <br> </p> <p><br> </p> <div class="x_moz-cite-prefix">On 2019-09-24 6:17 p.m., Zhao, Yong wrote:<br> </div> <blockquote type="cite"><style type="text/css" style="display:none">  </style> <div style="font-family:Calibri,Arial,Helvetica,sans-serif; font-size:12pt; color:rgb(0,0,0)"> <div style="margin:0px; font-size:12pt; font-family:Calibri,Arial,Helvetica,sans-serif"> Reviewed-by: Yong Zhao <a class="x_moz-txt-link-rfc2396E" href="mailto:Yong.Zhao@amd.com"> <Yong.Zhao@amd.com></a></div> <div style="margin:0px; font-size:12pt; font-family:Calibri,Arial,Helvetica,sans-serif"> <br> </div> <div style="margin:0px; font-size:12pt; font-family:Calibri,Arial,Helvetica,sans-serif"> Make sure to push to the new 5.3 branch.</div> <div style="margin:0px; font-size:12pt; font-family:Calibri,Arial,Helvetica,sans-serif"> <br> </div> <div style="margin:0px; font-size:12pt; font-family:Calibri,Arial,Helvetica,sans-serif"> Yong</div> <br> </div> <hr tabindex="-1" style="display:inline-block; width:98%"> <div id="x_divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" color="#000000" style="font-size:11pt"><b>From:</b> amd-gfx <a class="x_moz-txt-link-rfc2396E" href="mailto:amd-gfx-bounces@lists.freedesktop.org"> <amd-gfx-bounces@lists.freedesktop.org></a> on behalf of Liu, Shaoyun <a class="x_moz-txt-link-rfc2396E" href="mailto:Shaoyun.Liu@amd.com"> <Shaoyun.Liu@amd.com></a><br> <b>Sent:</b> Tuesday, September 24, 2019 6:16 PM<br> <b>To:</b> <a class="x_moz-txt-link-abbreviated" href="mailto:amd-gfx@lists.freedesktop.org"> amd-gfx@lists.freedesktop.org</a> <a class="x_moz-txt-link-rfc2396E" href="mailto:amd-gfx@lists.freedesktop.org"> <amd-gfx@lists.freedesktop.org></a><br> <b>Cc:</b> Liu, Shaoyun <a class="x_moz-txt-link-rfc2396E" href="mailto:Shaoyun.Liu@amd.com"> <Shaoyun.Liu@amd.com></a><br> <b>Subject:</b> [PATCH] drm/amdkfd: Add NAVI12 support from kfd side</font> <div> </div> </div> <div class="x_BodyFragment"><font size="2"><span style="font-size:11pt"> <div class="x_PlainText">Add device info for both navi12 PF and VF<br> <br> Change-Id: Ifb4035e65c12d153fc30e593fe109f9c7e0541f4<br> Signed-off-by: shaoyunl <a class="x_moz-txt-link-rfc2396E" href="mailto:shaoyun.liu@amd.com"> <shaoyun.liu@amd.com></a><br> ---<br> drivers/gpu/drm/amd/amdkfd/kfd_device.c | 19 +++++++++++++++++++<br> 1 file changed, 19 insertions(+)<br> <br> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c<br> index f329b82..edfbae5c 100644<br> --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c<br> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c<br> @@ -387,6 +387,24 @@ static const struct kfd_device_info navi10_device_info = {<br> .num_sdma_queues_per_engine = 8,<br> };<br> <br> +static const struct kfd_device_info navi12_device_info = {<br> + .asic_family = CHIP_NAVI12,<br> + .asic_name = "navi12",<br> + .max_pasid_bits = 16,<br> + .max_no_of_hqd = 24,<br> + .doorbell_size = 8,<br> + .ih_ring_entry_size = 8 * sizeof(uint32_t),<br> + .event_interrupt_class = &event_interrupt_class_v9,<br> + .num_of_watch_points = 4,<br> + .mqd_size_aligned = MQD_SIZE_ALIGNED,<br> + .needs_iommu_device = false,<br> + .supports_cwsr = true,<br> + .needs_pci_atomics = false,<br> + .num_sdma_engines = 2,<br> + .num_xgmi_sdma_engines = 0,<br> + .num_sdma_queues_per_engine = 8,<br> +};<br> +<br> static const struct kfd_device_info navi14_device_info = {<br> .asic_family = CHIP_NAVI14,<br> .asic_name = "navi14",<br> @@ -425,6 +443,7 @@ static const struct kfd_device_info *kfd_supported_devices[][2] = {<br> [CHIP_RENOIR] = {&renoir_device_info, NULL},<br> [CHIP_ARCTURUS] = {&arcturus_device_info, &arcturus_device_info},<br> [CHIP_NAVI10] = {&navi10_device_info, NULL},<br> + [CHIP_NAVI12] = {&navi12_device_info, &navi12_device_info},<br> [CHIP_NAVI14] = {&navi14_device_info, NULL},<br> };<br> <br> -- <br> 2.7.4<br> <br> _______________________________________________<br> amd-gfx mailing list<br> <a class="x_moz-txt-link-abbreviated" href="mailto:amd-gfx@lists.freedesktop.org">amd-gfx@lists.freedesktop.org</a><br> <a href="https://lists.freedesktop.org/mailman/listinfo/amd-gfx">https://lists.freedesktop.org/mailman/listinfo/amd-gfx</a></div> </span></font></div> </blockquote> </div> </body> </html>