Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amdgpu: Fix a printing message

The printing message "PSP loading VCN firmware" is mis-leading because
people might think driver is loading VCN firmware. Actually when this
message is printed, driver is just preparing some VCN ucode, not loading
VCN firmware yet. The actual VCN firmware loading will be in the PSP block
hw_init. Fix the printing message

Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>
Reviewed-by: Christian Konig <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Oak Zeng and committed by
Alex Deucher
95f71f12 4067cdb1

+4 -4
+1 -1
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
··· 119 119 adev->firmware.ucode[AMDGPU_UCODE_ID_VCN].fw = adev->vcn.fw; 120 120 adev->firmware.fw_size += 121 121 ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE); 122 - DRM_INFO("PSP loading VCN firmware\n"); 122 + dev_info(adev->dev, "Will use PSP to load VCN firmware\n"); 123 123 } 124 124 125 125 r = amdgpu_vcn_resume(adev);
+1 -1
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
··· 122 122 adev->firmware.ucode[AMDGPU_UCODE_ID_VCN].fw = adev->vcn.fw; 123 123 adev->firmware.fw_size += 124 124 ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE); 125 - DRM_INFO("PSP loading VCN firmware\n"); 125 + dev_info(adev->dev, "Will use PSP to load VCN firmware\n"); 126 126 } 127 127 128 128 r = amdgpu_vcn_resume(adev);
+1 -1
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
··· 152 152 adev->firmware.fw_size += 153 153 ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE); 154 154 } 155 - DRM_INFO("PSP loading VCN firmware\n"); 155 + dev_info(adev->dev, "Will use PSP to load VCN firmware\n"); 156 156 } 157 157 158 158 r = amdgpu_vcn_resume(adev);
+1 -1
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
··· 160 160 adev->firmware.fw_size += 161 161 ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE); 162 162 } 163 - DRM_INFO("PSP loading VCN firmware\n"); 163 + dev_info(adev->dev, "Will use PSP to load VCN firmware\n"); 164 164 } 165 165 166 166 r = amdgpu_vcn_resume(adev);