<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"> <p style="font-family:Arial;font-size:10pt;color:#008000;margin:15pt;" align="Left"> [Public]<br> </p> <br> <div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> Please use dev_info rather than DRM_INFO.</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);"> Alex</div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> <br> </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> amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of Oak Zeng <Oak.Zeng@amd.com><br> <b>Sent:</b> Thursday, July 15, 2021 9:25 PM<br> <b>To:</b> amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org><br> <b>Cc:</b> Xu, Feifei <Feifei.Xu@amd.com>; Kuehling, Felix <Felix.Kuehling@amd.com>; Liu, Leo <Leo.Liu@amd.com>; Zeng, Oak <Oak.Zeng@amd.com>; Zhang, Hawking <Hawking.Zhang@amd.com><br> <b>Subject:</b> [PATCH 1/5] drm/amdgpu: Fix a printing message</font> <div> </div> </div> <div class="BodyFragment"><font size="2"><span style="font-size:11pt;"> <div class="PlainText">The printing message "PSP loading VCN firmware" is mis-leading because<br> people might think driver is loading VCN firmware. Actually when this<br> message is printed, driver is just preparing some VCN ucode, not loading<br> VCN firmware yet. The actual VCN firmware loading will be in the PSP block<br> hw_init. Fix the printing message<br> <br> Signed-off-by: Oak Zeng <Oak.Zeng@amd.com><br> ---<br> drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 2 +-<br> drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 2 +-<br> drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 2 +-<br> drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 2 +-<br> 4 files changed, 4 insertions(+), 4 deletions(-)<br> <br> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c<br> index 284bb42..1f8e902 100644<br> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c<br> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c<br> @@ -119,7 +119,7 @@ static int vcn_v1_0_sw_init(void *handle)<br> adev->firmware.ucode[AMDGPU_UCODE_ID_VCN].fw = adev->vcn.fw;<br> adev->firmware.fw_size +=<br> ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE);<br> - DRM_INFO("PSP loading VCN firmware\n");<br> + DRM_INFO("VCN 1.0: Will use PSP to load VCN firmware\n");<br> }<br> <br> r = amdgpu_vcn_resume(adev);<br> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c<br> index 8af567c..ebe4f2b 100644<br> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c<br> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c<br> @@ -122,7 +122,7 @@ static int vcn_v2_0_sw_init(void *handle)<br> adev->firmware.ucode[AMDGPU_UCODE_ID_VCN].fw = adev->vcn.fw;<br> adev->firmware.fw_size +=<br> ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE);<br> - DRM_INFO("PSP loading VCN firmware\n");<br> + DRM_INFO("VCN 2.0: Will use PSP to load VCN firmware\n");<br> }<br> <br> r = amdgpu_vcn_resume(adev);<br> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c<br> index 888b17d..5741504 100644<br> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c<br> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c<br> @@ -152,7 +152,7 @@ static int vcn_v2_5_sw_init(void *handle)<br> adev->firmware.fw_size +=<br> ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE);<br> }<br> - DRM_INFO("PSP loading VCN firmware\n");<br> + DRM_INFO("VCN 2.5: Will use PSP to load VCN firmware\n");<br> }<br> <br> r = amdgpu_vcn_resume(adev);<br> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c<br> index c3580de..b81eae3 100644<br> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c<br> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c<br> @@ -158,7 +158,7 @@ static int vcn_v3_0_sw_init(void *handle)<br> adev->firmware.fw_size +=<br> ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE);<br> }<br> - DRM_INFO("PSP loading VCN firmware\n");<br> + DRM_INFO("VCN 3.0: Will use PSP to load VCN firmware\n");<br> }<br> <br> r = amdgpu_vcn_resume(adev);<br> -- <br> 2.7.4<br> <br> _______________________________________________<br> amd-gfx mailing list<br> amd-gfx@lists.freedesktop.org<br> <a href="https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Calexander.deucher%40amd.com%7C18117b603e8044be99c708d947f898f7%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637619955325132066%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=h5P5Asi3pBpWlB2o9xeq7Bjm7lBbRVJPyTY3aa%2B9O60%3D&reserved=0">https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Calexander.deucher%40amd.com%7C18117b603e8044be99c708d947f898f7%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637619955325132066%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=h5P5Asi3pBpWlB2o9xeq7Bjm7lBbRVJPyTY3aa%2B9O60%3D&reserved=0</a><br> </div> </span></font></div> </div> </body> </html>