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

Commit 735f654e authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amdgpu: Remove amdgpu_ucode_fini_bo 



The variable clean is unnecessary.

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c8963ea4

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

+0 −2
Original line number Diff line number Diff line
@@ -452,8 +452,6 @@ static int psp_hw_fini(void *handle) 
	if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP)

		return 0;



	amdgpu_ucode_fini_bo(adev);



	psp_ring_destroy(psp, PSP_RING_TYPE__KM);



	amdgpu_bo_free_kernel(&psp->tmr_bo, &psp->tmr_mc_addr, &psp->tmr_buf);

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

+0 −19
Original line number Diff line number Diff line
@@ -490,22 +490,3 @@ int amdgpu_ucode_init_bo(struct amdgpu_device *adev) 
	}

	return 0;

}
 


int amdgpu_ucode_fini_bo(struct amdgpu_device *adev)

{

	int i;

	struct amdgpu_firmware_info *ucode = NULL;



	if (!adev->firmware.fw_size)

		return 0;



	for (i = 0; i < adev->firmware.max_ucodes; i++) {

		ucode = &adev->firmware.ucode[i];

		if (ucode->fw) {

			ucode->mc_addr = 0;

			ucode->kaddr = NULL;

		}

	}



	return 0;

}

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

+1 −2
Original line number Diff line number Diff line
@@ -276,9 +276,8 @@ void amdgpu_ucode_print_gpu_info_hdr(const struct common_firmware_header *hdr); 
int amdgpu_ucode_validate(const struct firmware *fw);

bool amdgpu_ucode_hdr_version(union amdgpu_firmware_header *hdr,

				uint16_t hdr_major, uint16_t hdr_minor);

int amdgpu_ucode_init_bo(struct amdgpu_device *adev);

int amdgpu_ucode_fini_bo(struct amdgpu_device *adev);



int amdgpu_ucode_init_bo(struct amdgpu_device *adev);

int amdgpu_ucode_create_bo(struct amdgpu_device *adev);

void amdgpu_ucode_free_bo(struct amdgpu_device *adev);

drivers/gpu/drm/amd/powerplay/amd_powerplay.c

+0 −3
Original line number Diff line number Diff line
@@ -109,9 +109,6 @@ static int pp_sw_fini(void *handle) 


	hwmgr_sw_fini(hwmgr);



	if (adev->firmware.load_type == AMDGPU_FW_LOAD_SMU)

		amdgpu_ucode_fini_bo(adev);



	release_firmware(adev->pm.fw);

	adev->pm.fw = NULL;