Commit 95f71f12 authored by Oak Zeng's avatar Oak Zeng Committed by Alex Deucher
Browse files

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: default avatarOak Zeng <Oak.Zeng@amd.com>
Reviewed-by: default avatarChristian Konig <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4067cdb1

drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static int vcn_v1_0_sw_init(void *handle) 
		adev->firmware.ucode[AMDGPU_UCODE_ID_VCN].fw = adev->vcn.fw;

		adev->firmware.fw_size +=

			ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE);

		DRM_INFO("PSP loading VCN firmware\n");

		dev_info(adev->dev, "Will use PSP to load VCN firmware\n");

	}



	r = amdgpu_vcn_resume(adev);

drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static int vcn_v2_0_sw_init(void *handle) 
		adev->firmware.ucode[AMDGPU_UCODE_ID_VCN].fw = adev->vcn.fw;

		adev->firmware.fw_size +=

			ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE);

		DRM_INFO("PSP loading VCN firmware\n");

		dev_info(adev->dev, "Will use PSP to load VCN firmware\n");

	}



	r = amdgpu_vcn_resume(adev);

drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static int vcn_v2_5_sw_init(void *handle) 
			adev->firmware.fw_size +=

				ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE);

		}

		DRM_INFO("PSP loading VCN firmware\n");

		dev_info(adev->dev, "Will use PSP to load VCN firmware\n");

	}



	r = amdgpu_vcn_resume(adev);

drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static int vcn_v3_0_sw_init(void *handle) 
			adev->firmware.fw_size +=

				ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE);

		}

		DRM_INFO("PSP loading VCN firmware\n");

		dev_info(adev->dev, "Will use PSP to load VCN firmware\n");

	}



	r = amdgpu_vcn_resume(adev);