From: Lin Cao <[email protected]>

amdgpu_dpm_enable_vpe() should be skipped if dpm_enabled is false

Signed-off-by: Lin Cao <[email protected]>
Reviewed-by: Frank Min <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c
index 1f1e1a4343d82..f6adbc1906fde 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c
@@ -699,8 +699,10 @@ static int vpe_set_powergating_state(struct 
amdgpu_ip_block *ip_block,
        struct amdgpu_device *adev = ip_block->adev;
        struct amdgpu_vpe *vpe = &adev->vpe;
 
-       if (!adev->pm.dpm_enabled)
+       if (!adev->pm.dpm_enabled) {
                dev_err(adev->dev, "Without PM, cannot support powergating\n");
+               return 0;
+       }
 
        dev_dbg(adev->dev, "%s: %s!\n", __func__, (state == AMD_PG_STATE_GATE) 
? "GATE":"UNGATE");
 
-- 
2.55.0

Reply via email to