diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/4812-drm-amdgpu-Split-set_pg_state-into-separate-function.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.14.71/4812-drm-amdgpu-Split-set_pg_state-into-separate-function.patch | 88 |
1 files changed, 88 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/4812-drm-amdgpu-Split-set_pg_state-into-separate-function.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/4812-drm-amdgpu-Split-set_pg_state-into-separate-function.patch new file mode 100644 index 00000000..77f2abb6 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/4812-drm-amdgpu-Split-set_pg_state-into-separate-function.patch @@ -0,0 +1,88 @@ +From 3859d5619f1fb0cbe5107aacf0e0ddedde8262f1 Mon Sep 17 00:00:00 2001 +From: Rex Zhu <Rex.Zhu@amd.com> +Date: Wed, 13 Jun 2018 19:30:40 +0800 +Subject: [PATCH 4812/5725] drm/amdgpu: Split set_pg_state into separate + function + +1. add amdgpu_device_ip_late_set_pg_state function for + set pg state. +2. delete duplicate pg state setting on gfx_v8_0's late_init. + +Reviewed-by: Evan Quan <evan.quan@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 | 33 +++++++++++++++++++++++++----- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 4 ---- + 2 files changed, 28 insertions(+), 9 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +index 5a815cf..41cff36 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +@@ -1780,12 +1780,34 @@ static int amdgpu_device_ip_late_set_cg_state(struct amdgpu_device *adev) + } + } + +- if (adev->powerplay.pp_feature & PP_GFXOFF_MASK) +- /* enable gfx powergating */ +- amdgpu_device_ip_set_powergating_state(adev, +- AMD_IP_BLOCK_TYPE_GFX, +- AMD_PG_STATE_GATE); ++ return 0; ++} ++ ++static int amdgpu_device_ip_late_set_pg_state(struct amdgpu_device *adev) ++{ ++ int i = 0, r; + ++ if (amdgpu_emu_mode == 1) ++ return 0; ++ ++ for (i = 0; i < adev->num_ip_blocks; i++) { ++ if (!adev->ip_blocks[i].status.valid) ++ continue; ++ /* skip CG for VCE/UVD, it's handled specially */ ++ if (adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_UVD && ++ adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_VCE && ++ adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_VCN && ++ 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); ++ if (r) { ++ DRM_ERROR("set_powergating_state(gate) of IP block <%s> failed %d\n", ++ adev->ip_blocks[i].version->funcs->name, r); ++ return r; ++ } ++ } ++ } + return 0; + } + +@@ -1947,6 +1969,7 @@ static void amdgpu_device_ip_late_init_func_handler(struct work_struct *work) + struct amdgpu_device *adev = + container_of(work, struct amdgpu_device, late_init_work.work); + amdgpu_device_ip_late_set_cg_state(adev); ++ amdgpu_device_ip_late_set_pg_state(adev); + } + + /** +diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +index f9c7247d..92bda71 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +@@ -5595,10 +5595,6 @@ static int gfx_v8_0_late_init(void *handle) + return r; + } + +- amdgpu_device_ip_set_powergating_state(adev, +- AMD_IP_BLOCK_TYPE_GFX, +- AMD_PG_STATE_GATE); +- + return 0; + } + +-- +2.7.4 + |