Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8f8c4e7 authored by Srinivasan Shanmugam's avatar Srinivasan Shanmugam Committed by Greg Kroah-Hartman
Browse files

drm/amdgpu: Update min() to min_t() in 'amdgpu_info_ioctl' 



[ Upstream commit a0cc8e1512ad72c9f97cdcb76d42715730adaf62 ]

Fixes the following:

WARNING: min() should probably be min_t(size_t, size, sizeof(ip))
+               ret = copy_to_user(out, &ip, min((size_t)size, sizeof(ip)));

And other style fixes:

WARNING: Prefer 'unsigned int' to bare use of 'unsigned'
WARNING: Missing a blank line after declarations

Cc: Christian König <christian.koenig@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSrinivasan Shanmugam <srinivasan.shanmugam@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c6b423ab

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

+8 −6
Original line number Diff line number Diff line
@@ -471,6 +471,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file 
			crtc = (struct drm_crtc *)minfo->crtcs[i];

			if (crtc && crtc->base.id == info->mode_crtc.id) {

				struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);



				ui32 = amdgpu_crtc->crtc_id;

				found = 1;

				break;
@@ -489,7 +490,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file 
		if (ret)

			return ret;



		ret = copy_to_user(out, &ip, min((size_t)size, sizeof(ip)));

		ret = copy_to_user(out, &ip, min_t(size_t, size, sizeof(ip)));

		return ret ? -EFAULT : 0;

	}

	case AMDGPU_INFO_HW_IP_COUNT: {
@@ -625,17 +626,18 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file 
				    ? -EFAULT : 0;

	}

	case AMDGPU_INFO_READ_MMR_REG: {

		unsigned n, alloc_size;

		unsigned int n, alloc_size;

		uint32_t *regs;

		unsigned se_num = (info->read_mmr_reg.instance >>

		unsigned int se_num = (info->read_mmr_reg.instance >>

				   AMDGPU_INFO_MMR_SE_INDEX_SHIFT) &

				  AMDGPU_INFO_MMR_SE_INDEX_MASK;

		unsigned sh_num = (info->read_mmr_reg.instance >>

		unsigned int sh_num = (info->read_mmr_reg.instance >>

				   AMDGPU_INFO_MMR_SH_INDEX_SHIFT) &

				  AMDGPU_INFO_MMR_SH_INDEX_MASK;



		/* set full masks if the userspace set all bits

		 * in the bitfields */

		 * in the bitfields

		 */

		if (se_num == AMDGPU_INFO_MMR_SE_INDEX_MASK)

			se_num = 0xffffffff;

		else if (se_num >= AMDGPU_GFX_MAX_SE)
@@ -766,7 +768,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file 
				    min((size_t)size, sizeof(dev_info))) ? -EFAULT : 0;

	}

	case AMDGPU_INFO_VCE_CLOCK_TABLE: {

		unsigned i;

		unsigned int i;

		struct drm_amdgpu_info_vce_clock_table vce_clk_table = {};

		struct amd_vce_state *vce_state;