diff options
| author |   Huang Rui <ray.huang@amd.com> | 2019-05-29 23:18:01 -0500 |
|---|---|---|
| committer |   Alex Deucher <alexander.deucher@amd.com> | 2019-06-21 18:59:27 -0500 |
| commit | 948f540cd0120ef9d622af42c1b95f28cf992da0 (patch) | |
| tree | 94028e3a89403ba9b543977be638842c262e9dc6 | |
| parent | drm/amd/powerplay: update smu11_driver_if_navi10.h (diff) | |
| download | linux-dev-948f540cd0120ef9d622af42c1b95f28cf992da0.tar.xz linux-dev-948f540cd0120ef9d622af42c1b95f28cf992da0.zip | |
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: Huang Rui <ray.huang@amd.com>
Acked-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c index 6a74f5499ef7..765018322abd 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c @@ -249,7 +249,7 @@ static void amdgpu_vcn_idle_work_handler(struct work_struct *work) if (fences == 0) { 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); else 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) if (set_clocks) { 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); else amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_VCN, diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c index 71f93f9a1368..9e0b439b41ca 100644 --- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c @@ -865,10 +865,7 @@ static int smu_hw_init(void *handle) if (!smu->pm_enabled) adev->pm.dpm_enabled = false; else - adev->pm.dpm_enabled = true; - /* TODO: will set dpm_enabled flag while VCN and DAL DPM is workable */ - if (adev->asic_type != CHIP_NAVI10) - adev->pm.dpm_enabled = true; + adev->pm.dpm_enabled = true; /* TODO: will set dpm_enabled flag while VCN and DAL DPM is workable */ pr_info("SMU is initialized successfully!\n"); |