Commit d59198d2 authored by Peyton Lee's avatar Peyton Lee Committed by Alex Deucher
Browse files

drm/amdgpu/vpe: fix vpe dpm setup failed 



The vpe dpm settings should be done before firmware is loaded.
Otherwise, the frequency cannot be successfully raised.

Signed-off-by: default avatarPeyton Lee <peytolee@amd.com>
Reviewed-by: default avatarLang Yu <lang.yu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent aebd3eb9

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

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ int amdgpu_vpe_configure_dpm(struct amdgpu_vpe *vpe) 
	dpm_ctl &= 0xfffffffe; /* Disable DPM */

	WREG32(vpe_get_reg_offset(vpe, 0, vpe->regs.dpm_enable), dpm_ctl);

	dev_dbg(adev->dev, "%s: disable vpe dpm\n", __func__);

	return 0;

	return -EINVAL;

}



int amdgpu_vpe_psp_update_sram(struct amdgpu_device *adev)

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

+7 −7
Original line number Diff line number Diff line
@@ -144,6 +144,12 @@ static int vpe_v6_1_load_microcode(struct amdgpu_vpe *vpe) 
			WREG32(vpe_get_reg_offset(vpe, j, regVPEC_CNTL), ret);

	}



	/* setup collaborate mode */

	vpe_v6_1_set_collaborate_mode(vpe, true);

	/* setup DPM */

	if (amdgpu_vpe_configure_dpm(vpe))

		dev_warn(adev->dev, "VPE failed to enable DPM\n");



	/*

	 * For VPE 6.1.1, still only need to add master's offset, and psp will apply it to slave as well.

	 * Here use instance 0 as master.
@@ -159,11 +165,7 @@ static int vpe_v6_1_load_microcode(struct amdgpu_vpe *vpe) 
		adev->vpe.cmdbuf_cpu_addr[0] = f32_offset;

		adev->vpe.cmdbuf_cpu_addr[1] = f32_cntl;



		amdgpu_vpe_psp_update_sram(adev);

		vpe_v6_1_set_collaborate_mode(vpe, true);

		amdgpu_vpe_configure_dpm(vpe);



		return 0;

		return amdgpu_vpe_psp_update_sram(adev);

	}



	vpe_hdr = (const struct vpe_firmware_header_v1_0 *)adev->vpe.fw->data;
@@ -196,8 +198,6 @@ static int vpe_v6_1_load_microcode(struct amdgpu_vpe *vpe) 
	}



	vpe_v6_1_halt(vpe, false);

	vpe_v6_1_set_collaborate_mode(vpe, true);

	amdgpu_vpe_configure_dpm(vpe);



	return 0;

}