diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4448-drm-amdgpu-add-JPEG-common-functions-to-amdgpu_jpeg.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4448-drm-amdgpu-add-JPEG-common-functions-to-amdgpu_jpeg.patch | 131 |
1 files changed, 131 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4448-drm-amdgpu-add-JPEG-common-functions-to-amdgpu_jpeg.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4448-drm-amdgpu-add-JPEG-common-functions-to-amdgpu_jpeg.patch new file mode 100644 index 00000000..aac3870f --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4448-drm-amdgpu-add-JPEG-common-functions-to-amdgpu_jpeg.patch @@ -0,0 +1,131 @@ +From c3341685e454cee5c72b56d69b02f50e03b1f077 Mon Sep 17 00:00:00 2001 +From: Leo Liu <leo.liu@amd.com> +Date: Fri, 8 Nov 2019 13:12:05 -0500 +Subject: [PATCH 4448/4736] drm/amdgpu: add JPEG common functions to + amdgpu_jpeg + +They will be used for JPEG2.0 and later. + +Signed-off-by: Leo Liu <leo.liu@amd.com> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 76 ++++++++++++++++++++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 10 ++++ + 2 files changed, 86 insertions(+) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c +index d9a547d4d3b2..5727f00afc8e 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c +@@ -26,9 +26,85 @@ + + #include "amdgpu.h" + #include "amdgpu_jpeg.h" ++#include "amdgpu_pm.h" + #include "soc15d.h" + #include "soc15_common.h" + ++#define JPEG_IDLE_TIMEOUT msecs_to_jiffies(1000) ++ ++static void amdgpu_jpeg_idle_work_handler(struct work_struct *work); ++ ++int amdgpu_jpeg_sw_init(struct amdgpu_device *adev) ++{ ++ INIT_DELAYED_WORK(&adev->jpeg.idle_work, amdgpu_jpeg_idle_work_handler); ++ ++ return 0; ++} ++ ++int amdgpu_jpeg_sw_fini(struct amdgpu_device *adev) ++{ ++ int i; ++ ++ cancel_delayed_work_sync(&adev->jpeg.idle_work); ++ ++ for (i = 0; i < adev->jpeg.num_jpeg_inst; ++i) { ++ if (adev->jpeg.harvest_config & (1 << i)) ++ continue; ++ ++ amdgpu_ring_fini(&adev->jpeg.inst[i].ring_dec); ++ } ++ ++ return 0; ++} ++ ++int amdgpu_jpeg_suspend(struct amdgpu_device *adev) ++{ ++ cancel_delayed_work_sync(&adev->jpeg.idle_work); ++ ++ return 0; ++} ++ ++int amdgpu_jpeg_resume(struct amdgpu_device *adev) ++{ ++ return 0; ++} ++ ++static void amdgpu_jpeg_idle_work_handler(struct work_struct *work) ++{ ++ struct amdgpu_device *adev = ++ container_of(work, struct amdgpu_device, jpeg.idle_work.work); ++ unsigned int fences = 0; ++ unsigned int i; ++ ++ for (i = 0; i < adev->jpeg.num_jpeg_inst; ++i) { ++ if (adev->jpeg.harvest_config & (1 << i)) ++ continue; ++ ++ fences += amdgpu_fence_count_emitted(&adev->jpeg.inst[i].ring_dec); ++ } ++ ++ if (fences == 0) ++ amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_JPEG, ++ AMD_PG_STATE_GATE); ++ else ++ schedule_delayed_work(&adev->jpeg.idle_work, JPEG_IDLE_TIMEOUT); ++} ++ ++void amdgpu_jpeg_ring_begin_use(struct amdgpu_ring *ring) ++{ ++ struct amdgpu_device *adev = ring->adev; ++ bool set_clocks = !cancel_delayed_work_sync(&adev->jpeg.idle_work); ++ ++ if (set_clocks) ++ amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_JPEG, ++ AMD_PG_STATE_UNGATE); ++} ++ ++void amdgpu_jpeg_ring_end_use(struct amdgpu_ring *ring) ++{ ++ schedule_delayed_work(&ring->adev->jpeg.idle_work, JPEG_IDLE_TIMEOUT); ++} ++ + int amdgpu_jpeg_dec_ring_test_ring(struct amdgpu_ring *ring) + { + struct amdgpu_device *adev = ring->adev; +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h +index a8d988c25f45..5e2e06ec13df 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h +@@ -41,8 +41,18 @@ struct amdgpu_jpeg { + struct amdgpu_jpeg_inst inst[AMDGPU_MAX_JPEG_INSTANCES]; + struct amdgpu_jpeg_reg internal; + unsigned harvest_config; ++ struct delayed_work idle_work; ++ enum amd_powergating_state cur_state; + }; + ++int amdgpu_jpeg_sw_init(struct amdgpu_device *adev); ++int amdgpu_jpeg_sw_fini(struct amdgpu_device *adev); ++int amdgpu_jpeg_suspend(struct amdgpu_device *adev); ++int amdgpu_jpeg_resume(struct amdgpu_device *adev); ++ ++void amdgpu_jpeg_ring_begin_use(struct amdgpu_ring *ring); ++void amdgpu_jpeg_ring_end_use(struct amdgpu_ring *ring); ++ + int amdgpu_jpeg_dec_ring_test_ring(struct amdgpu_ring *ring); + int amdgpu_jpeg_dec_ring_test_ib(struct amdgpu_ring *ring, long timeout); + +-- +2.17.1 + |