diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.19.8/2307-drm-amd-powerplay-set-dpm_enabled-flag-but-don-t-ena.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.19.8/2307-drm-amd-powerplay-set-dpm_enabled-flag-but-don-t-ena.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/2307-drm-amd-powerplay-set-dpm_enabled-flag-but-don-t-ena.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/2307-drm-amd-powerplay-set-dpm_enabled-flag-but-don-t-ena.patch new file mode 100644 index 00000000..1d15fad4 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/2307-drm-amd-powerplay-set-dpm_enabled-flag-but-don-t-ena.patch @@ -0,0 +1,58 @@ +From f3a89ef77c8cb416c9fb15d91496585085e70349 Mon Sep 17 00:00:00 2001 +From: Huang Rui <ray.huang@amd.com> +Date: Wed, 29 May 2019 23:18:01 -0500 +Subject: [PATCH 2307/2940] 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> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 4 ++-- + 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 06f5e5ce9db1..652963e52a5a 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"); + +-- +2.17.1 + |