6.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peyton Lee peytolee@amd.com
commit eed14eb48ee176fe0144c6a999d00c855d0b199b upstream.
To fix mode2 reset failure. Should power on VPE when hw_init.
Signed-off-by: Peyton Lee peytolee@amd.com Reviewed-by: Lang Yu lang.yu@amd.com Signed-off-by: Alex Deucher alexander.deucher@amd.com Cc: "Gong, Richard" richard.gong@amd.com Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c | 6 ++++++ 1 file changed, 6 insertions(+)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c @@ -390,6 +390,12 @@ static int vpe_hw_init(void *handle) struct amdgpu_vpe *vpe = &adev->vpe; int ret;
+ /* Power on VPE */ + ret = amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_VPE, + AMD_PG_STATE_UNGATE); + if (ret) + return ret; + ret = vpe_load_microcode(vpe); if (ret) return ret;