diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/0154-drm-amdgpu-Refine-function-name-and-function-args.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/0154-drm-amdgpu-Refine-function-name-and-function-args.patch | 125 |
1 files changed, 125 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/0154-drm-amdgpu-Refine-function-name-and-function-args.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/0154-drm-amdgpu-Refine-function-name-and-function-args.patch new file mode 100644 index 00000000..4f244851 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/0154-drm-amdgpu-Refine-function-name-and-function-args.patch @@ -0,0 +1,125 @@ +From 6fc1e0b4e4569935f72509a64dddd7a11eedf8da Mon Sep 17 00:00:00 2001 +From: Rex Zhu <Rex.Zhu@amd.com> +Date: Tue, 14 Aug 2018 13:32:30 +0800 +Subject: [PATCH 0154/2940] drm/amdgpu: Refine function name and function args + +There are no any logical changes here. + +1. change function names: + amdgpu_device_ip_late_set_pg/cg_state to + amdgpu_device_set_pg/cg_state. +2. add a function argument cg/pg_state, so + we can enable/disable cg/pg through those functions + +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 39 +++++++++++----------- + 1 file changed, 19 insertions(+), 20 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +index ebc279e252c1..c7b4bdf21249 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +@@ -1738,24 +1738,26 @@ static bool amdgpu_device_check_vram_lost(struct amdgpu_device *adev) + } + + /** +- * amdgpu_device_ip_late_set_cg_state - late init for clockgating ++ * amdgpu_device_set_cg_state - set clockgating for amdgpu device + * + * @adev: amdgpu_device pointer + * +- * Late initialization pass enabling clockgating for hardware IPs. + * The list of all the hardware IPs that make up the asic is walked and the +- * set_clockgating_state callbacks are run. This stage is run late +- * in the init process. ++ * set_clockgating_state callbacks are run. ++ * Late initialization pass enabling clockgating for hardware IPs. ++ * Fini or suspend, pass disabling clockgating for hardware IPs. + * Returns 0 on success, negative error code on failure. + */ +-static int amdgpu_device_ip_late_set_cg_state(struct amdgpu_device *adev) ++static int amdgpu_device_set_cg_state(struct amdgpu_device *adev, ++ enum amd_clockgating_state state) + { +- int i = 0, r; ++ int i, j, r; + + if (amdgpu_emu_mode == 1) + return 0; + +- for (i = 0; i < adev->num_ip_blocks; i++) { ++ for (j = 0; j < adev->num_ip_blocks; j++) { ++ i = state == AMD_CG_STATE_GATE ? j : adev->num_ip_blocks - j - 1; + if (!adev->ip_blocks[i].status.valid) + continue; + /* skip CG for VCE/UVD, it's handled specially */ +@@ -1765,7 +1767,7 @@ static int amdgpu_device_ip_late_set_cg_state(struct amdgpu_device *adev) + adev->ip_blocks[i].version->funcs->set_clockgating_state) { + /* enable clockgating to save power */ + r = adev->ip_blocks[i].version->funcs->set_clockgating_state((void *)adev, +- AMD_CG_STATE_GATE); ++ state); + if (r) { + DRM_ERROR("set_clockgating_state(gate) of IP block <%s> failed %d\n", + adev->ip_blocks[i].version->funcs->name, r); +@@ -1777,14 +1779,15 @@ static int amdgpu_device_ip_late_set_cg_state(struct amdgpu_device *adev) + return 0; + } + +-static int amdgpu_device_ip_late_set_pg_state(struct amdgpu_device *adev) ++static int amdgpu_device_set_pg_state(struct amdgpu_device *adev, enum amd_powergating_state state) + { +- int i = 0, r; ++ int i, j, r; + + if (amdgpu_emu_mode == 1) + return 0; + +- for (i = 0; i < adev->num_ip_blocks; i++) { ++ for (j = 0; j < adev->num_ip_blocks; j++) { ++ i = state == AMD_PG_STATE_GATE ? j : adev->num_ip_blocks - j - 1; + if (!adev->ip_blocks[i].status.valid) + continue; + /* skip CG for VCE/UVD, it's handled specially */ +@@ -1794,7 +1797,7 @@ static int amdgpu_device_ip_late_set_pg_state(struct amdgpu_device *adev) + adev->ip_blocks[i].version->funcs->set_powergating_state) { + /* enable powergating to save power */ + r = adev->ip_blocks[i].version->funcs->set_powergating_state((void *)adev, +- AMD_PG_STATE_GATE); ++ state); + if (r) { + DRM_ERROR("set_powergating_state(gate) of IP block <%s> failed %d\n", + adev->ip_blocks[i].version->funcs->name, r); +@@ -1835,8 +1838,8 @@ static int amdgpu_device_ip_late_init(struct amdgpu_device *adev) + } + } + +- amdgpu_device_ip_late_set_cg_state(adev); +- amdgpu_device_ip_late_set_pg_state(adev); ++ amdgpu_device_set_cg_state(adev, AMD_CG_STATE_GATE); ++ amdgpu_device_set_pg_state(adev, AMD_PG_STATE_GATE); + + queue_delayed_work(system_wq, &adev->late_init_work, + msecs_to_jiffies(AMDGPU_RESUME_MS)); +@@ -1954,13 +1957,9 @@ static int amdgpu_device_ip_fini(struct amdgpu_device *adev) + } + + /** +- * amdgpu_device_ip_late_init_func_handler - work handler for clockgating +- * +- * @work: work_struct ++ * amdgpu_device_ip_late_init_func_handler - work handler for ib test + * +- * Work handler for amdgpu_device_ip_late_set_cg_state. We put the +- * clockgating setup into a worker thread to speed up driver init and +- * resume from suspend. ++ * @work: work_struct. + */ + static void amdgpu_device_ip_late_init_func_handler(struct work_struct *work) + { +-- +2.17.1 + |