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

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

drm/amdgpu: disable legacy path of firmware check if powerplay is enabled 



Powerplay will use a different interface once it's integrated.  These
legacy pathes will be removed once powerplay is enabled by default.

Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarJammy Zhou <Jammy.Zhou@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1f7371b2

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

+42 −38
Original line number Diff line number Diff line
@@ -2902,6 +2902,7 @@ static int gfx_v8_0_rlc_resume(struct amdgpu_device *adev) 


	gfx_v8_0_rlc_reset(adev);



	if (!amdgpu_powerplay) {

		if (!adev->firmware.smu_load) {

			/* legacy rlc firmware loading */

			r = gfx_v8_0_rlc_load_microcode(adev);
@@ -2913,6 +2914,7 @@ static int gfx_v8_0_rlc_resume(struct amdgpu_device *adev) 
			if (r)

				return -EINVAL;

		}

	}



	gfx_v8_0_rlc_start(adev);
@@ -3802,6 +3804,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 (!amdgpu_powerplay) {

		if (!adev->firmware.smu_load) {

			/* legacy firmware loading */

			r = gfx_v8_0_cp_gfx_load_microcode(adev);
@@ -3832,6 +3835,7 @@ static int gfx_v8_0_cp_resume(struct amdgpu_device *adev) 
			if (r)

				return -EINVAL;

		}

	}



	r = gfx_v8_0_cp_gfx_resume(adev);

	if (r)

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

+13 −11
Original line number Diff line number Diff line
@@ -727,6 +727,7 @@ static int sdma_v3_0_start(struct amdgpu_device *adev) 
{

	int r, i;



	if (!amdgpu_powerplay) {

		if (!adev->firmware.smu_load) {

			r = sdma_v3_0_load_microcode(adev);

			if (r)
@@ -741,6 +742,7 @@ static int sdma_v3_0_start(struct amdgpu_device *adev) 
					return -EINVAL;

			}

		}

	}



	/* unhalt the MEs */

	sdma_v3_0_enable(adev, true);