Commit 948f540c authored by Huang Rui's avatar Huang Rui Committed by Alex Deucher

drm/amd/powerplay: set dpm_enabled flag but don't enable vcn dpm

This patch sets dpm_enabled flag but don't enable vcn dpm, because vcn dpm
doesn't work so far and we needs to enable the sysfs interfaces.
Signed-off-by: default avatarHuang Rui <ray.huang@amd.com>
Acked-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent eb0b49ea
...@@ -249,7 +249,7 @@ static void amdgpu_vcn_idle_work_handler(struct work_struct *work) ...@@ -249,7 +249,7 @@ static void amdgpu_vcn_idle_work_handler(struct work_struct *work)
if (fences == 0) { if (fences == 0) {
amdgpu_gfx_off_ctrl(adev, true); amdgpu_gfx_off_ctrl(adev, true);
if (adev->pm.dpm_enabled) if (adev->asic_type != CHIP_NAVI10 && adev->pm.dpm_enabled)
amdgpu_dpm_enable_uvd(adev, false); amdgpu_dpm_enable_uvd(adev, false);
else else
amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_VCN, amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_VCN,
...@@ -266,7 +266,7 @@ void amdgpu_vcn_ring_begin_use(struct amdgpu_ring *ring) ...@@ -266,7 +266,7 @@ void amdgpu_vcn_ring_begin_use(struct amdgpu_ring *ring)
if (set_clocks) { if (set_clocks) {
amdgpu_gfx_off_ctrl(adev, false); amdgpu_gfx_off_ctrl(adev, false);
if (adev->pm.dpm_enabled) if (adev->asic_type != CHIP_NAVI10 && adev->pm.dpm_enabled)
amdgpu_dpm_enable_uvd(adev, true); amdgpu_dpm_enable_uvd(adev, true);
else else
amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_VCN, amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_VCN,
......
...@@ -865,10 +865,7 @@ static int smu_hw_init(void *handle) ...@@ -865,10 +865,7 @@ static int smu_hw_init(void *handle)
if (!smu->pm_enabled) if (!smu->pm_enabled)
adev->pm.dpm_enabled = false; adev->pm.dpm_enabled = false;
else else
adev->pm.dpm_enabled = true; adev->pm.dpm_enabled = true; /* TODO: will set dpm_enabled flag while VCN and DAL DPM is workable */
/* TODO: will set dpm_enabled flag while VCN and DAL DPM is workable */
if (adev->asic_type != CHIP_NAVI10)
adev->pm.dpm_enabled = true;
pr_info("SMU is initialized successfully!\n"); pr_info("SMU is initialized successfully!\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment