Commit b41b026f authored Mar 22, 2021 by Arnd Bergmann Committed by Greg Kroah-Hartman May 22, 2021

amdgpu: avoid incorrect %hu format string



[ Upstream commit 7d98d416c2cc1c1f7d9508e887de4630e521d797 ]

clang points out that the %hu format string does not match the type
of the variables here:

drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c:263:7: warning: format specifies type 'unsigned short' but the argument has type 'unsigned int' [-Wformat]
                                  version_major, version_minor);
                                  ^~~~~~~~~~~~~
include/drm/drm_print.h:498:19: note: expanded from macro 'DRM_ERROR'
        __drm_err(fmt, ##__VA_ARGS__)
                  ~~~    ^~~~~~~~~~~

Change it to a regular %u, the same way a previous patch did for
another instance of the same warning.

Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Tom Rix <trix@redhat.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 4bdce781

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -231,7 +231,7 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev)
		if ((adev->asic_type == CHIP_POLARIS10 \|\|
		adev->asic_type == CHIP_POLARIS11) &&
		(adev->uvd.fw_version < FW_1_66_16))
		DRM_ERROR("POLARIS10/11 UVD firmware version %hu.%hu is too old.\n",
		DRM_ERROR("POLARIS10/11 UVD firmware version %u.%u is too old.\n",
		version_major, version_minor);
		} else {
		unsigned int enc_major, enc_minor, dec_minor;