[PATCH 1/3][SRU][OEM-5.6] drm: move DP_MAX_DOWNSTREAM_PORTS from i915 to drm core

Koba Ko koba.ko at canonical.com
Wed Sep 16 06:51:20 UTC 2020


From: Oleg Vasilev <oleg.vasilev at intel.com>

BugLink: https://bugs.launchpad.net/bugs/1893752                                 

DP_MAX_DOWNSTREAM_PORTS=0x10 is a vendor-independent constant.

Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
Signed-off-by: Oleg Vasilev <oleg.vasilev at intel.com>
Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
Cc: intel-gfx at lists.freedesktop.org
Signed-off-by: Jani Nikula <jani.nikula at intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190829114854.1539-1-oleg.vasilev@intel.com
(cherry picked from commit e5124751892a5ca66d07aead1e74bc6c55638d74)
Signed-off-by: Koba Ko <koba.ko at canonical.com>
---
 drivers/gpu/drm/i915/display/intel_display_types.h | 2 --
 include/drm/drm_dp_helper.h                        | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index efd82ecd520b..7fb22523af34 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -1170,8 +1170,6 @@ struct intel_hdmi {
 };
 
 struct intel_dp_mst_encoder;
-#define DP_MAX_DOWNSTREAM_PORTS		0x10
-
 /*
  * enum link_m_n_set:
  *	When platform provides two set of M_N registers for dp, we can
diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h
index eff5a69051d6..c5580e988826 100644
--- a/include/drm/drm_dp_helper.h
+++ b/include/drm/drm_dp_helper.h
@@ -392,6 +392,8 @@
 # define DP_DS_12BPC		            2
 # define DP_DS_16BPC		            3
 
+#define DP_MAX_DOWNSTREAM_PORTS		    0x10
+
 /* DP Forward error Correction Registers */
 #define DP_FEC_CAPABILITY		    0x090    /* 1.4 */
 # define DP_FEC_CAPABLE			    (1 << 0)
-- 
2.25.1




More information about the kernel-team mailing list