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

Commit 790d84fd authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amdgpu: delete dead code about fw load check 



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 d04f2576

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

+13 −47
Original line number Diff line number Diff line
@@ -4132,18 +4132,12 @@ static int gfx_v8_0_rlc_resume(struct amdgpu_device *adev) 
	gfx_v8_0_rlc_reset(adev);

	gfx_v8_0_init_pg(adev);



	if (!adev->pp_enabled) {

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



	if (adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT) {

		/* legacy rlc firmware loading */

		r = gfx_v8_0_rlc_load_microcode(adev);

		if (r)

			return r;

		} else {

			r = adev->smu.smumgr_funcs->check_fw_load_finish(adev,

							AMDGPU_UCODE_ID_RLC_G);

			if (r)

				return -EINVAL;

		}

	}



	gfx_v8_0_rlc_start(adev);
@@ -4959,8 +4953,7 @@ static int gfx_v8_0_cp_resume(struct amdgpu_device *adev) 
	if (!(adev->flags & AMD_IS_APU))

		gfx_v8_0_enable_gui_idle_interrupt(adev, false);



	if (!adev->pp_enabled) {

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

	if (adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT) {

			/* legacy firmware loading */

		r = gfx_v8_0_cp_gfx_load_microcode(adev);

		if (r)
@@ -4969,33 +4962,6 @@ static int gfx_v8_0_cp_resume(struct amdgpu_device *adev) 
		r = gfx_v8_0_cp_compute_load_microcode(adev);

		if (r)

			return r;

		} else {

			r = adev->smu.smumgr_funcs->check_fw_load_finish(adev,

							AMDGPU_UCODE_ID_CP_CE);

			if (r)

				return -EINVAL;



			r = adev->smu.smumgr_funcs->check_fw_load_finish(adev,

							AMDGPU_UCODE_ID_CP_PFP);

			if (r)

				return -EINVAL;



			r = adev->smu.smumgr_funcs->check_fw_load_finish(adev,

							AMDGPU_UCODE_ID_CP_ME);

			if (r)

				return -EINVAL;



			if (adev->asic_type == CHIP_TOPAZ) {

				r = gfx_v8_0_cp_compute_load_microcode(adev);

				if (r)

					return r;

			} else {

				r = adev->smu.smumgr_funcs->check_fw_load_finish(adev,

										 AMDGPU_UCODE_ID_CP_MEC1);

				if (r)

					return -EINVAL;

			}

		}

	}



	r = gfx_v8_0_cp_gfx_resume(adev);

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

+5 −15
Original line number Diff line number Diff line
@@ -561,21 +561,11 @@ static int sdma_v2_4_start(struct amdgpu_device *adev) 
{

	int r;



	if (!adev->pp_enabled) {

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



	if (adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT) {

		r = sdma_v2_4_load_microcode(adev);

		if (r)

			return r;

		} else {

			r = adev->smu.smumgr_funcs->check_fw_load_finish(adev,

							AMDGPU_UCODE_ID_SDMA0);

			if (r)

				return -EINVAL;

			r = adev->smu.smumgr_funcs->check_fw_load_finish(adev,

							AMDGPU_UCODE_ID_SDMA1);

			if (r)

				return -EINVAL;

		}

	}



	/* halt the engine before programing */

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

+5 −16
Original line number Diff line number Diff line
@@ -819,23 +819,12 @@ static int sdma_v3_0_load_microcode(struct amdgpu_device *adev) 
 */

static int sdma_v3_0_start(struct amdgpu_device *adev)

{

	int r, i;

	int r;



	if (!adev->pp_enabled) {

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

	if (adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT) {

		r = sdma_v3_0_load_microcode(adev);

		if (r)

			return r;

		} else {

			for (i = 0; i < adev->sdma.num_instances; i++) {

				r = adev->smu.smumgr_funcs->check_fw_load_finish(adev,

										 (i == 0) ?

										 AMDGPU_UCODE_ID_SDMA0 :

										 AMDGPU_UCODE_ID_SDMA1);

				if (r)

					return -EINVAL;

			}

		}

	}



	/* disable sdma engine before programing it */