diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4458-drm-amdgpu-enable-JPEG2.0-dpm.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4458-drm-amdgpu-enable-JPEG2.0-dpm.patch | 81 |
1 files changed, 81 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4458-drm-amdgpu-enable-JPEG2.0-dpm.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4458-drm-amdgpu-enable-JPEG2.0-dpm.patch new file mode 100644 index 00000000..513e29a8 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4458-drm-amdgpu-enable-JPEG2.0-dpm.patch @@ -0,0 +1,81 @@ +From 826c350371077f7c2450fdf3e66a8431268e01f0 Mon Sep 17 00:00:00 2001 +From: Leo Liu <leo.liu@amd.com> +Date: Tue, 12 Nov 2019 11:57:36 -0500 +Subject: [PATCH 4458/4736] drm/amdgpu: enable JPEG2.0 dpm + +By using its own enabling function + +Signed-off-by: Leo Liu <leo.liu@amd.com> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 12 ++++++++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.h | 1 + + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 10 +++++++++- + 3 files changed, 22 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +index 07f620938ae4..b4746dbe93a6 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +@@ -2715,6 +2715,18 @@ void amdgpu_pm_print_power_states(struct amdgpu_device *adev) + + } + ++void amdgpu_dpm_enable_jpeg(struct amdgpu_device *adev, bool enable) ++{ ++ int ret = 0; ++ ++ if (is_support_sw_smu(adev)) { ++ ret = smu_dpm_set_power_gate(&adev->smu, AMD_IP_BLOCK_TYPE_JPEG, enable); ++ if (ret) ++ DRM_ERROR("[SW SMU]: dpm enable jpeg failed, state = %s, ret = %d. \n", ++ enable ? "true" : "false", ret); ++ } ++} ++ + int amdgpu_pm_virt_sysfs_init(struct amdgpu_device *adev) + { + int ret = 0; +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.h +index ef31448ee8d8..3da1da277805 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.h +@@ -41,5 +41,6 @@ void amdgpu_pm_compute_clocks(struct amdgpu_device *adev); + void amdgpu_dpm_thermal_work_handler(struct work_struct *work); + void amdgpu_dpm_enable_uvd(struct amdgpu_device *adev, bool enable); + void amdgpu_dpm_enable_vce(struct amdgpu_device *adev, bool enable); ++void amdgpu_dpm_enable_jpeg(struct amdgpu_device *adev, bool enable); + + #endif +diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c +index 3869730b2331..a78292d84854 100644 +--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c +@@ -333,6 +333,9 @@ static int jpeg_v2_0_start(struct amdgpu_device *adev) + struct amdgpu_ring *ring = &adev->jpeg.inst->ring_dec; + int r; + ++ if (adev->pm.dpm_enabled) ++ amdgpu_dpm_enable_jpeg(adev, true); ++ + /* disable power gating */ + r = jpeg_v2_0_disable_power_gating(adev); + if (r) +@@ -388,8 +391,13 @@ static int jpeg_v2_0_stop(struct amdgpu_device *adev) + + /* enable power gating */ + r = jpeg_v2_0_enable_power_gating(adev); ++ if (r) ++ return r; + +- return r; ++ if (adev->pm.dpm_enabled) ++ amdgpu_dpm_enable_jpeg(adev, false); ++ ++ return 0; + } + + /** +-- +2.17.1 + |