Commit 0b437e64 authored by Tom Rix's avatar Tom Rix Committed by Alex Deucher
Browse files

drm/amdgpu: remove h from printk format specifier 



See Documentation/core-api/printk-formats.rst.
h should no longer be used in the format specifier for printk.

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarTom Rix <trix@redhat.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b4bc9d95

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

+2 −2
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev) 


		version_major = (le32_to_cpu(hdr->ucode_version) >> 24) & 0xff;

		version_minor = (le32_to_cpu(hdr->ucode_version) >> 8) & 0xff;

		DRM_INFO("Found UVD firmware Version: %hu.%hu Family ID: %hu\n",

		DRM_INFO("Found UVD firmware Version: %u.%u Family ID: %u\n",

			version_major, version_minor, family_id);



		/*
@@ -267,7 +267,7 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev) 
		dec_minor = (le32_to_cpu(hdr->ucode_version) >> 8) & 0xff;

		enc_minor = (le32_to_cpu(hdr->ucode_version) >> 24) & 0x3f;

		enc_major = (le32_to_cpu(hdr->ucode_version) >> 30) & 0x3;

		DRM_INFO("Found UVD firmware ENC: %hu.%hu DEC: .%hu Family ID: %hu\n",

		DRM_INFO("Found UVD firmware ENC: %u.%u DEC: .%u Family ID: %u\n",

			enc_major, enc_minor, dec_minor, family_id);



		adev->uvd.max_handles = AMDGPU_MAX_UVD_HANDLES;

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

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ int amdgpu_vce_sw_init(struct amdgpu_device *adev, unsigned long size) 
	version_major = (ucode_version >> 20) & 0xfff;

	version_minor = (ucode_version >> 8) & 0xfff;

	binary_id = ucode_version & 0xff;

	DRM_INFO("Found VCE firmware Version: %hhd.%hhd Binary ID: %hhd\n",

	DRM_INFO("Found VCE firmware Version: %d.%d Binary ID: %d\n",

		version_major, version_minor, binary_id);

	adev->vce.fw_version = ((version_major << 24) | (version_minor << 16) |

				(binary_id << 8));

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

+2 −2
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev) 
		enc_major = fw_check;

		dec_ver = (le32_to_cpu(hdr->ucode_version) >> 24) & 0xf;

		vep = (le32_to_cpu(hdr->ucode_version) >> 28) & 0xf;

		DRM_INFO("Found VCN firmware Version ENC: %hu.%hu DEC: %hu VEP: %hu Revision: %hu\n",

		DRM_INFO("Found VCN firmware Version ENC: %u.%u DEC: %u VEP: %u Revision: %u\n",

			enc_major, enc_minor, dec_ver, vep, fw_rev);

	} else {

		unsigned int version_major, version_minor, family_id;
@@ -189,7 +189,7 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev) 
		family_id = le32_to_cpu(hdr->ucode_version) & 0xff;

		version_major = (le32_to_cpu(hdr->ucode_version) >> 24) & 0xff;

		version_minor = (le32_to_cpu(hdr->ucode_version) >> 8) & 0xff;

		DRM_INFO("Found VCN firmware Version: %hu.%hu Family ID: %hu\n",

		DRM_INFO("Found VCN firmware Version: %u.%u Family ID: %u\n",

			version_major, version_minor, family_id);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE