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

Commit 951e0962 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: load MEC ucode manually on iceland 



The smc doesn't handle it.

Reviewed-by: default avatarKen Wang <Qingqing.Wang@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 97dde76a

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

+10 −4
Original line number Diff line number Diff line
@@ -3851,12 +3851,18 @@ static int gfx_v8_0_cp_resume(struct amdgpu_device *adev) 
			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);

	if (r)