|
@@ -198,7 +198,6 @@ static int uvd_v4_2_hw_init(void *handle)
|
|
|
amdgpu_ring_commit(ring);
|
|
|
|
|
|
done:
|
|
|
-
|
|
|
if (!r)
|
|
|
DRM_INFO("UVD initialized successfully.\n");
|
|
|
|
|
@@ -694,8 +693,24 @@ static int uvd_v4_2_set_powergating_state(void *handle,
|
|
|
|
|
|
if (state == AMD_PG_STATE_GATE) {
|
|
|
uvd_v4_2_stop(adev);
|
|
|
+ if (adev->pg_flags & AMD_PG_SUPPORT_UVD && amdgpu_dpm == 0) {
|
|
|
+ if (!(RREG32_SMC(ixCURRENT_PG_STATUS) & 0x4)) {
|
|
|
+ WREG32(mmUVD_PGFSM_CONFIG, (UVD_PGFSM_CONFIG__UVD_PGFSM_FSM_ADDR_MASK |
|
|
|
+ UVD_PGFSM_CONFIG__UVD_PGFSM_POWER_DOWN_MASK |
|
|
|
+ UVD_PGFSM_CONFIG__UVD_PGFSM_P1_SELECT_MASK));
|
|
|
+ mdelay(20);
|
|
|
+ }
|
|
|
+ }
|
|
|
return 0;
|
|
|
} else {
|
|
|
+ if (adev->pg_flags & AMD_PG_SUPPORT_UVD && amdgpu_dpm == 0) {
|
|
|
+ if (RREG32_SMC(ixCURRENT_PG_STATUS) & 0x4) {
|
|
|
+ WREG32(mmUVD_PGFSM_CONFIG, (UVD_PGFSM_CONFIG__UVD_PGFSM_FSM_ADDR_MASK |
|
|
|
+ UVD_PGFSM_CONFIG__UVD_PGFSM_POWER_UP_MASK |
|
|
|
+ UVD_PGFSM_CONFIG__UVD_PGFSM_P1_SELECT_MASK));
|
|
|
+ mdelay(30);
|
|
|
+ }
|
|
|
+ }
|
|
|
return uvd_v4_2_start(adev);
|
|
|
}
|
|
|
}
|