diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1962-drm-amdgpu-move-struct-amd_powerplay-to-amdgpu.h.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1962-drm-amdgpu-move-struct-amd_powerplay-to-amdgpu.h.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1962-drm-amdgpu-move-struct-amd_powerplay-to-amdgpu.h.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1962-drm-amdgpu-move-struct-amd_powerplay-to-amdgpu.h.patch new file mode 100644 index 00000000..ebc3b6f9 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1962-drm-amdgpu-move-struct-amd_powerplay-to-amdgpu.h.patch @@ -0,0 +1,54 @@ +From 0541e77e8d8141b2539c231a3303db8f067d2d28 Mon Sep 17 00:00:00 2001 +From: Rex Zhu <Rex.Zhu@amd.com> +Date: Fri, 29 Sep 2017 16:07:14 +0800 +Subject: [PATCH 1962/4131] drm/amdgpu: move struct amd_powerplay to amdgpu.h + +Change-Id: I781c2d4b0a116a74d7a9cb83d3fcc131e3c20b34 +Acked-by: Alex Deucher <alexander.deucher@amd.com> +Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> + + Conflicts: + drivers/gpu/drm/amd/amdgpu/amdgpu.h +--- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 7 +++++++ + drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 7 ------- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +index ec1e75b..3f710ae 100755 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +@@ -1458,6 +1458,13 @@ struct amdgpu_ssg { + #endif + }; + ++struct amd_powerplay { ++ struct cgs_device *cgs_device; ++ void *pp_handle; ++ const struct amd_ip_funcs *ip_funcs; ++ const struct amd_pm_funcs *pp_funcs; ++}; ++ + #define AMDGPU_RESET_MAGIC_NUM 64 + struct amdgpu_device { + struct device *dev; +diff --git a/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h b/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h +index 006954e..47478e0 100644 +--- a/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h ++++ b/drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h +@@ -122,12 +122,5 @@ struct pp_gpu_power { + support << PP_STATE_SUPPORT_SHIFT |\ + state << PP_STATE_SHIFT) + +-struct amd_powerplay { +- struct cgs_device *cgs_device; +- void *pp_handle; +- const struct amd_ip_funcs *ip_funcs; +- const struct amd_pm_funcs *pp_funcs; +-}; +- + + #endif /* _AMD_POWERPLAY_H_ */ +-- +2.7.4 + |