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

Commit e8a7f59e authored by Alex Deucher's avatar Alex Deucher Committed by Greg Kroah-Hartman
Browse files

drm/amdgpu/gmc8: always load MC firmware in the driver 



commit b52b6738cc2d50d2a8f4d0095bcb5a86716008a5 upstream.

Some power features rely on the driver loaded version so always
load the MC firmware from the driver even if the vbios loaded
a version already.

Acked-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarJunwei Zhang <Jerry.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 39bdb328

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

+1 −8
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ static int gmc_v8_0_polaris_mc_load_microcode(struct amdgpu_device *adev) 
	const struct mc_firmware_header_v1_0 *hdr;

	const __le32 *fw_data = NULL;

	const __le32 *io_mc_regs = NULL;

	u32 data, vbios_version;

	u32 data;

	int i, ucode_size, regs_size;



	/* Skip MC ucode loading on SR-IOV capable boards.
@@ -376,13 +376,6 @@ static int gmc_v8_0_polaris_mc_load_microcode(struct amdgpu_device *adev) 
	if (amdgpu_sriov_bios(adev))

		return 0;



	WREG32(mmMC_SEQ_IO_DEBUG_INDEX, 0x9F);

	data = RREG32(mmMC_SEQ_IO_DEBUG_DATA);

	vbios_version = data & 0xf;



	if (vbios_version == 0)

		return 0;



	if (!adev->gmc.fw)

		return -EINVAL;