aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2666-drm-amd-display-Move-conn_state-to-header.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2666-drm-amd-display-Move-conn_state-to-header.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2666-drm-amd-display-Move-conn_state-to-header.patch67
1 files changed, 67 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2666-drm-amd-display-Move-conn_state-to-header.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2666-drm-amd-display-Move-conn_state-to-header.patch
new file mode 100644
index 00000000..89cd380f
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2666-drm-amd-display-Move-conn_state-to-header.patch
@@ -0,0 +1,67 @@
+From a90b2ead3462b2a065980b8eeddfbe3f957fccda Mon Sep 17 00:00:00 2001
+From: Harry Wentland <harry.wentland@amd.com>
+Date: Thu, 19 Oct 2017 14:28:23 -0400
+Subject: [PATCH 2666/4131] drm/amd/display: Move conn_state to header
+
+We'll need it in amdgpu_dm_mst_types.c as well.
+
+Signed-off-by: Harry Wentland <harry.wentland@amd.com>
+Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
+Acked-by: Harry Wentland <harry.wentland@amd.com>
+Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 13 -------------
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 12 ++++++++++++
+ 2 files changed, 12 insertions(+), 13 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+index d3733b3..2d0ba6d 100644
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+@@ -1667,19 +1667,6 @@ static int dm_early_init(void *handle)
+ return 0;
+ }
+
+-struct dm_connector_state {
+- struct drm_connector_state base;
+-
+- enum amdgpu_rmx_type scaling;
+- uint8_t underscan_vborder;
+- uint8_t underscan_hborder;
+- bool underscan_enable;
+- struct mod_freesync_user_enable user_enable;
+-};
+-
+-#define to_dm_connector_state(x)\
+- container_of((x), struct dm_connector_state, base)
+-
+ static bool modeset_required(struct drm_crtc_state *crtc_state,
+ struct dc_stream_state *new_stream,
+ struct dc_stream_state *old_stream)
+diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
+index 5ae795c..6bbf6be 100644
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
+@@ -224,6 +224,18 @@ struct dm_atomic_state {
+
+ #define to_dm_atomic_state(x) container_of(x, struct dm_atomic_state, base)
+
++struct dm_connector_state {
++ struct drm_connector_state base;
++
++ enum amdgpu_rmx_type scaling;
++ uint8_t underscan_vborder;
++ uint8_t underscan_hborder;
++ bool underscan_enable;
++ struct mod_freesync_user_enable user_enable;
++};
++
++#define to_dm_connector_state(x)\
++ container_of((x), struct dm_connector_state, base)
+
+ void amdgpu_dm_connector_funcs_reset(struct drm_connector *connector);
+ struct drm_connector_state *
+--
+2.7.4
+