Commit e03f04b8 authored by Srinivasan Shanmugam's avatar Srinivasan Shanmugam Committed by Alex Deucher
Browse files

drm/amdgpu: Fix warnings in amdgpu _sdma, _ucode.c 



Fix below checkpatch warnings:

WARNING: Prefer 'unsigned int' to bare use of 'unsigned'
WARNING: Comparisons should place the constant on the right side of the test
WARNING: Missing a blank line after declarations

Cc: Luben Tuikov <luben.tuikov@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Christian König <christian.koenig@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>
parent f10984a3

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

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ int amdgpu_sdma_get_index_from_ring(struct amdgpu_ring *ring, uint32_t *index) 
}



uint64_t amdgpu_sdma_get_csa_mc_addr(struct amdgpu_ring *ring,

				     unsigned vmid)

				     unsigned int vmid)

{

	struct amdgpu_device *adev = ring->adev;

	uint64_t csa_mc_addr;

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

+3 −2
Original line number Diff line number Diff line
@@ -748,7 +748,7 @@ static int amdgpu_ucode_init_single_fw(struct amdgpu_device *adev, 
	const struct imu_firmware_header_v1_0 *imu_hdr = NULL;

	u8 *ucode_addr;



	if (NULL == ucode->fw)

	if (!ucode->fw)

		return 0;



	ucode->mc_addr = mc_addr;
@@ -972,7 +972,7 @@ static int amdgpu_ucode_patch_jt(struct amdgpu_firmware_info *ucode, 
	uint8_t *src_addr = NULL;

	uint8_t *dst_addr = NULL;



	if (NULL == ucode->fw)

	if (!ucode->fw)

		return 0;



	comm_hdr = (const struct common_firmware_header *)ucode->fw->data;
@@ -1043,6 +1043,7 @@ int amdgpu_ucode_init_bo(struct amdgpu_device *adev) 
			if (i == AMDGPU_UCODE_ID_CP_MEC1 &&

			    adev->firmware.load_type != AMDGPU_FW_LOAD_PSP) {

				const struct gfx_firmware_header_v1_0 *cp_hdr;



				cp_hdr = (const struct gfx_firmware_header_v1_0 *)ucode->fw->data;

				amdgpu_ucode_patch_jt(ucode,  adev->firmware.fw_buf_mc + fw_offset,

						    adev->firmware.fw_buf_ptr + fw_offset);