Skip to contentSkip to conversation

drm: report dp downstream port type as a subconnector property

PATCH In review Jeevan B 4 participants 16 messages Apr 7, 2020 – Apr 21, 2020

Subsystems (7)
lore
Share & tools
lore

Jeevan B

author
#0 lore raw

PATCH 1/5 drm: report dp downstream port type as a subconnector property

From: Oleg Vasilev <[email protected]>

Currently, downstream port type is only reported in debugfs. This information should be considered important since it reflects the actual physical connector type. Some userspace (e.g. window compositors) may want to show this info to a user.

The 'subconnector' property is already utilized for DVI-I and TV-out for reporting connector subtype.

The initial motivation for this feature came from i2c test [1]. It is supposed to be skipped on VGA connectors, but it cannot detect VGA over DP and fails instead.

v2:
- Ville: utilized drm_dp_is_branch()
- Ville: implement DP 1.0 downstream type info
- Replaced create_dp_properties with add_dp_subconnector_property
- Added dp_set_subconnector_property helper

v4:
- Ville: add DP1.0 best assumption about subconnector
- Ville: assume DVI is DVI-D
- Ville: reuse Writeback enum value for Virtual subconnector
- Renamed #defines: HDMI -> HDMIA, DP -> DisplayPort

v5: rebase

[1]: https://bugs.freedesktop.org/show_bug.cgi?id=104097

---
 drivers/gpu/drm/drm_connector.c | 49 ++++++++++++++++++++++++--
 drivers/gpu/drm/drm_dp_helper.c | 77 +++++++++++++++++++++++++++++++++++++++++
 include/drm/drm_connector.h     |  3 ++
 include/drm/drm_dp_helper.h     |  8 +++++
 include/drm/drm_mode_config.h   |  6 ++++
 include/uapi/drm/drm_mode.h     | 21 ++++++-----
 6 files changed, 154 insertions(+), 10 deletions(-)
drivers/gpu/drm/drm_connector.c +47 -2
index b1099e1..b6972d1 100644
@@ -844,7 +844,7 @@ static const struct drm_prop_enum_list drm_dvi_i_select_enum_list[] = {
 DRM_ENUM_NAME_FN(drm_get_dvi_i_select_name, drm_dvi_i_select_enum_list)
 
 static const struct drm_prop_enum_list drm_dvi_i_subconnector_enum_list[] = {
-	{ DRM_MODE_SUBCONNECTOR_Unknown,   "Unknown"   }, /* DVI-I and TV-out */
+	{ DRM_MODE_SUBCONNECTOR_Unknown,   "Unknown"   }, /* DVI-I, TV-out and DP */
 	{ DRM_MODE_SUBCONNECTOR_DVID,      "DVI-D"     }, /* DVI-I  */
 	{ DRM_MODE_SUBCONNECTOR_DVIA,      "DVI-A"     }, /* DVI-I  */
 };
@@ -861,7 +861,7 @@ static const struct drm_prop_enum_list drm_tv_select_enum_list[] = {
 DRM_ENUM_NAME_FN(drm_get_tv_select_name, drm_tv_select_enum_list)
 
 static const struct drm_prop_enum_list drm_tv_subconnector_enum_list[] = {
-	{ DRM_MODE_SUBCONNECTOR_Unknown,   "Unknown"   }, /* DVI-I and TV-out */
+	{ DRM_MODE_SUBCONNECTOR_Unknown,   "Unknown"   }, /* DVI-I, TV-out and DP */
 	{ DRM_MODE_SUBCONNECTOR_Composite, "Composite" }, /* TV-out */
 	{ DRM_MODE_SUBCONNECTOR_SVIDEO,    "SVIDEO"    }, /* TV-out */
 	{ DRM_MODE_SUBCONNECTOR_Component, "Component" }, /* TV-out */
@@ -870,6 +870,19 @@ static const struct drm_prop_enum_list drm_tv_subconnector_enum_list[] = {
 DRM_ENUM_NAME_FN(drm_get_tv_subconnector_name,
 		 drm_tv_subconnector_enum_list)
 
+static const struct drm_prop_enum_list drm_dp_subconnector_enum_list[] = {
+	{ DRM_MODE_SUBCONNECTOR_Unknown,     "Unknown"   }, /* DVI-I, TV-out and DP */
+	{ DRM_MODE_SUBCONNECTOR_VGA,	     "VGA"       }, /* DP */
+	{ DRM_MODE_SUBCONNECTOR_DVID,	     "DVI-D"     }, /* DP */
+	{ DRM_MODE_SUBCONNECTOR_HDMIA,	     "HDMI"      }, /* DP */
+	{ DRM_MODE_SUBCONNECTOR_DisplayPort, "DP"        }, /* DP */
+	{ DRM_MODE_SUBCONNECTOR_Wireless,    "Wireless"  }, /* DP */
+	{ DRM_MODE_SUBCONNECTOR_Native,	     "Native"    }, /* DP */
+};
+
+DRM_ENUM_NAME_FN(drm_get_dp_subconnector_name,
+		 drm_dp_subconnector_enum_list)
+
 static const struct drm_prop_enum_list hdmi_colorspaces[] = {
 	/* For Default case, driver will set the colorspace */
 	{ DRM_MODE_COLORIMETRY_DEFAULT, "Default" },
@@ -1186,6 +1199,14 @@ static const struct drm_prop_enum_list dp_colorspaces[] = {
  *	can also expose this property to external outputs, in which case they
  *	must support "None", which should be the default (since external screens
  *	have a built-in scaler).
+ *
+ * subconnector:
+ *	This property is used by DVI-I, TVout and DisplayPort to indicate different
+ *	connector subtypes. Enum values more or less match with those from main
+ *	connector types.
+ *	For DVI-I and TVout there is also a matching property "select subconnector"
+ *	allowing to switch between signal types.
+ *	DP subconnector corresponds to a downstream port.
  */
 
 int drm_connector_create_standard_properties(struct drm_device *dev)
@@ -1275,6 +1296,30 @@ int drm_mode_create_dvi_i_properties(struct drm_device *dev)
 EXPORT_SYMBOL(drm_mode_create_dvi_i_properties);
 
 /**
+ * drm_mode_add_dp_subconnector_property - create subconnector property for DP
+ * @connector: drm_connector to attach property
+ *
+ * Called by a driver when DP connector is created.
+ */
+void drm_mode_add_dp_subconnector_property(struct drm_connector *connector)
+{
+	struct drm_mode_config *mode_config = &connector->dev->mode_config;
+
+	if (!mode_config->dp_subconnector_property)
+		mode_config->dp_subconnector_property =
+			drm_property_create_enum(connector->dev,
+				DRM_MODE_PROP_IMMUTABLE,
+				"subconnector",
+				drm_dp_subconnector_enum_list,
+				ARRAY_SIZE(drm_dp_subconnector_enum_list));
+
+	drm_object_attach_property(&connector->base,
+				   mode_config->dp_subconnector_property,
+				   DRM_MODE_SUBCONNECTOR_Unknown);
+}
+EXPORT_SYMBOL(drm_mode_add_dp_subconnector_property);
+
+/**
  * DOC: HDMI connector properties
  *
  * content type (HDMI specific):
drivers/gpu/drm/drm_dp_helper.c +77 -0

83 lines not on this page · raw message

include/drm/drm_connector.h +3 -0
index fd543d1..82797c8 100644
@@ -1556,10 +1556,13 @@ const char *drm_get_dvi_i_subconnector_name(int val);
 const char *drm_get_dvi_i_select_name(int val);
 const char *drm_get_tv_subconnector_name(int val);
 const char *drm_get_tv_select_name(int val);
+const char *drm_get_dp_subconnector_name(int val);
 const char *drm_get_content_protection_name(int val);
 const char *drm_get_hdcp_content_type_name(int val);
 
 int drm_mode_create_dvi_i_properties(struct drm_device *dev);
+void drm_mode_add_dp_subconnector_property(struct drm_connector *connector);
+
 int drm_mode_create_tv_margin_properties(struct drm_device *dev);
 int drm_mode_create_tv_properties(struct drm_device *dev,
 				  unsigned int num_modes,
include/drm/drm_dp_helper.h +8 -0
index 305533d..6408b31 100644
@@ -26,6 +26,7 @@
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/types.h>
+#include <drm/drm_connector.h>
 
 /*
  * Unless otherwise noted, all values are from the DP 1.1a spec.  Note that
@@ -1599,6 +1600,13 @@ int drm_dp_downstream_max_bpc(const u8 dpcd[DP_RECEIVER_CAP_SIZE],
 int drm_dp_downstream_id(struct drm_dp_aux *aux, char id[6]);
 void drm_dp_downstream_debug(struct seq_file *m, const u8 dpcd[DP_RECEIVER_CAP_SIZE],
 			     const u8 port_cap[4], struct drm_dp_aux *aux);
+enum drm_mode_subconnector
+drm_dp_subconnector_type(const u8 dpcd[DP_RECEIVER_CAP_SIZE],
+			 const u8 port_cap[4]);
+void drm_dp_set_subconnector_property(struct drm_connector *connector,
+				      enum drm_connector_status status,
+				      const u8 *dpcd,
+				      const u8 port_cap[4]);
 
 void drm_dp_remote_aux_init(struct drm_dp_aux *aux);
 void drm_dp_aux_init(struct drm_dp_aux *aux);
include/drm/drm_mode_config.h +6 -0
index 6c3ef49..085fb00 100644
@@ -681,6 +681,12 @@ struct drm_mode_config {
 	struct drm_property *dvi_i_select_subconnector_property;
 
 	/**
+	 * @dp_subconnector_property: Optional DP property to differentiate
+	 * between different DP downstream port types.
+	 */
+	struct drm_property *dp_subconnector_property;
+
+	/**
 	 * @tv_subconnector_property: Optional TV property to differentiate
 	 * between different TV connector types.
 	 */
include/uapi/drm/drm_mode.h +13 -8
index 735c8cf..3358c6b 100644
@@ -332,14 +332,19 @@ struct drm_mode_get_encoder {
 /* This is for connectors with multiple signal types. */
 /* Try to match DRM_MODE_CONNECTOR_X as closely as possible. */
 enum drm_mode_subconnector {
-	DRM_MODE_SUBCONNECTOR_Automatic = 0,
-	DRM_MODE_SUBCONNECTOR_Unknown = 0,
-	DRM_MODE_SUBCONNECTOR_DVID = 3,
-	DRM_MODE_SUBCONNECTOR_DVIA = 4,
-	DRM_MODE_SUBCONNECTOR_Composite = 5,
-	DRM_MODE_SUBCONNECTOR_SVIDEO = 6,
-	DRM_MODE_SUBCONNECTOR_Component = 8,
-	DRM_MODE_SUBCONNECTOR_SCART = 9,
+	DRM_MODE_SUBCONNECTOR_Automatic   = 0,  /* DVI-I, TV     */
+	DRM_MODE_SUBCONNECTOR_Unknown     = 0,  /* DVI-I, TV, DP */
+	DRM_MODE_SUBCONNECTOR_VGA	  = 1,  /*            DP */
+	DRM_MODE_SUBCONNECTOR_DVID	  = 3,  /* DVI-I      DP */
+	DRM_MODE_SUBCONNECTOR_DVIA	  = 4,  /* DVI-I         */
+	DRM_MODE_SUBCONNECTOR_Composite   = 5,  /*        TV     */
+	DRM_MODE_SUBCONNECTOR_SVIDEO	  = 6,  /*        TV     */
+	DRM_MODE_SUBCONNECTOR_Component   = 8,  /*        TV     */
+	DRM_MODE_SUBCONNECTOR_SCART	  = 9,  /*        TV     */
+	DRM_MODE_SUBCONNECTOR_DisplayPort = 10, /*            DP */
+	DRM_MODE_SUBCONNECTOR_HDMIA       = 11, /*            DP */
+	DRM_MODE_SUBCONNECTOR_Native      = 15, /*            DP */
+	DRM_MODE_SUBCONNECTOR_Wireless    = 18, /*            DP */
 };
 
 #define DRM_MODE_CONNECTOR_Unknown	0
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
author
#1 lore raw

PATCH 2/5 drm/i915: utilize subconnector property for DP

From: Oleg Vasilev <[email protected]>

Since DP-specific information is stored in driver's structures, every driver needs to implement subconnector property by itself.

v2: updates to match previous commit changes

v3: rebase

---
 drivers/gpu/drm/i915/display/intel_dp.c | 8 ++++++++
 1 file changed, 8 insertions(+)
drivers/gpu/drm/i915/display/intel_dp.c +8 -0
index db6ae8e..ba443e1 100644
@@ -6155,6 +6155,11 @@ intel_dp_detect(struct drm_connector *connector,
 	 */
 	intel_display_power_flush_work(dev_priv);
 
+	if (!intel_dp_is_edp(intel_dp))
+		drm_dp_set_subconnector_property(connector,
+						 status,
+						 intel_dp->dpcd,
+						 intel_dp->downstream_ports);
 	return status;
 }
 
@@ -7211,6 +7216,9 @@ intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connect
 	struct drm_i915_private *dev_priv = to_i915(connector->dev);
 	enum port port = dp_to_dig_port(intel_dp)->base.port;
 
+	if (!intel_dp_is_edp(intel_dp))
+		drm_mode_add_dp_subconnector_property(connector);
+
 	if (!IS_G4X(dev_priv) && port != PORT_A)
 		intel_attach_force_audio_property(connector);
 
Signature · 6 lines
2.7.4

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v1 2/5
#2 lore raw

Re: [PATCH 2/5] drm/i915: utilize subconnector property for DP

Quoted 9 lines · Jeevan B

From: Oleg Vasilev <[email protected]>

Since DP-specific information is stored in driver's structures, every driver needs to implement subconnector property by itself.

v2: updates to match previous commit changes

v3: rebase

Quoted 7 lines

You're not supposed to add the Link: tag yourself.

Quoted 29 lines
---
 drivers/gpu/drm/i915/display/intel_dp.c | 8 ++++++++
 1 file changed, 8 insertions(+)
drivers/gpu/drm/i915/display/intel_dp.c +8 -0
index db6ae8e..ba443e1 100644
@@ -6155,6 +6155,11 @@ intel_dp_detect(struct drm_connector *connector,
 	 */
 	intel_display_power_flush_work(dev_priv);
 
+	if (!intel_dp_is_edp(intel_dp))
+		drm_dp_set_subconnector_property(connector,
+						 status,
+						 intel_dp->dpcd,
+						 intel_dp->downstream_ports);
 	return status;
 }
 
@@ -7211,6 +7216,9 @@ intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connect
 	struct drm_i915_private *dev_priv = to_i915(connector->dev);
 	enum port port = dp_to_dig_port(intel_dp)->base.port;
 
+	if (!intel_dp_is_edp(intel_dp))
+		drm_mode_add_dp_subconnector_property(connector);
+
 	if (!IS_G4X(dev_priv) && port != PORT_A)
 		intel_attach_force_audio_property(connector);
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
author
#3 lore raw

Re: [PATCH 2/5] drm/i915: utilize subconnector property for DP

Quoted 18 lines · Jani Nikula
Quoted 9 lines · Jeevan B

From: Oleg Vasilev <[email protected]>

Since DP-specific information is stored in driver's structures, every driver needs to implement subconnector property by itself.

v2: updates to match previous commit changes

v3: rebase

Quoted 7 lines
Quoted 1 line

You're not supposed to add the Link: tag yourself.

I will do the necessary change.

Quoted 2 lines

Thanks
Jeevan B

Quoted 26 lines
Quoted 26 lines

---
 drivers/gpu/drm/i915/display/intel_dp.c | 8 ++++++++
 1 file changed, 8 insertions(+)
drivers/gpu/drm/i915/display/intel_dp.c +5 -0
index db6ae8e..ba443e1 100644
@@ -6155,6 +6155,11 @@ intel_dp_detect(struct drm_connector *connector,
 	 */
 	intel_display_power_flush_work(dev_priv);
 
+	if (!intel_dp_is_edp(intel_dp))
+		drm_dp_set_subconnector_property(connector,
+						 status,
+						 intel_dp->dpcd,
+						 intel_dp->downstream_ports);
 	return status;
 }
 
@@ -7211,6 +7216,9 @@ intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connect
 	struct drm_i915_private *dev_priv = to_i915(connector->dev);
 	enum port port = dp_to_dig_port(intel_dp)->base.port;
 
Quoted 8 lines
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_dp.c +3 -0
+	if (!intel_dp_is_edp(intel_dp))
+		drm_mode_add_dp_subconnector_property(connector);
+
 	if (!IS_G4X(dev_priv) && port != PORT_A)
 		intel_attach_force_audio_property(connector);
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

author
#4 lore raw

PATCH 3/5 drm/nouveau: utilize subconnector property for DP

In reply to Jeevan B

From: Oleg Vasilev <[email protected]>

Since DP-specific information is stored in driver's structures, every driver needs to implement subconnector property by itself.

v2: rebase

---
 drivers/gpu/drm/nouveau/nouveau_connector.c | 13 +++++++++++++
 drivers/gpu/drm/nouveau/nouveau_dp.c        |  9 +++++++++
 drivers/gpu/drm/nouveau/nouveau_encoder.h   |  1 +
 3 files changed, 23 insertions(+)
drivers/gpu/drm/nouveau/nouveau_connector.c +13 -0
index 9a9a7f5..6464e48 100644
@@ -648,6 +648,17 @@ nouveau_connector_detect(struct drm_connector *connector, bool force)
 	pm_runtime_mark_last_busy(dev->dev);
 	pm_runtime_put_autosuspend(dev->dev);
 
+	if (connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort ||
+	    connector->connector_type == DRM_MODE_CONNECTOR_eDP) {
+		enum drm_mode_subconnector subconnector = DRM_MODE_SUBCONNECTOR_Unknown;
+
+		if (conn_status == connector_status_connected && nv_encoder)
+			subconnector = nv_encoder->dp.subconnector;
+		drm_object_property_set_value(&connector->base,
+			connector->dev->mode_config.dp_subconnector_property,
+			subconnector);
+	}
+
 	return conn_status;
 }
 
@@ -1373,6 +1384,8 @@ nouveau_connector_create(struct drm_device *dev,
 			kfree(nv_connector);
 			return ERR_PTR(ret);
 		}
+
+		drm_mode_add_dp_subconnector_property(connector);
 		funcs = &nouveau_connector_funcs;
 		break;
 	default:
drivers/gpu/drm/nouveau/nouveau_dp.c +9 -0
index 2674f15..85eac85 100644
@@ -62,6 +62,7 @@ nouveau_dp_detect(struct nouveau_encoder *nv_encoder)
 	struct nouveau_drm *drm = nouveau_drm(dev);
 	struct nvkm_i2c_aux *aux;
 	u8 dpcd[8];
+	u8 port_cap[DP_MAX_DOWNSTREAM_PORTS] = {};
 	int ret;
 
 	aux = nv_encoder->aux;
@@ -72,6 +73,14 @@ nouveau_dp_detect(struct nouveau_encoder *nv_encoder)
 	if (ret)
 		return ret;
 
+	if (dpcd[DP_DPCD_REV] > 0x10) {
+		ret = nvkm_rdaux(aux, DP_DOWNSTREAM_PORT_0,
+				 port_cap, DP_MAX_DOWNSTREAM_PORTS);
+		if (ret)
+			memset(port_cap, 0, DP_MAX_DOWNSTREAM_PORTS);
+	}
+	nv_encoder->dp.subconnector = drm_dp_subconnector_type(dpcd, port_cap);
+
 	nv_encoder->dp.link_bw = 27000 * dpcd[1];
 	nv_encoder->dp.link_nr = dpcd[2] & DP_MAX_LANE_COUNT_MASK;
 
drivers/gpu/drm/nouveau/nouveau_encoder.h +1 -0
index 3517f92..e17971a 100644
@@ -63,6 +63,7 @@ struct nouveau_encoder {
 			struct nv50_mstm *mstm;
 			int link_nr;
 			int link_bw;
+			enum drm_mode_subconnector subconnector;
 		} dp;
 	};
 
Signature · 1 line
2.7.4
author
#5 lore raw

PATCH 4/5 drm/amdgpu: utilize subconnector property for DP through atombios

In reply to Jeevan B

From: Oleg Vasilev <[email protected]>

Since DP-specific information is stored in driver's structures, every driver needs to implement subconnector property by itself.

v2: rebase

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 10 ++++++++++
 drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h       |  1 +
 drivers/gpu/drm/amd/amdgpu/atombios_dp.c       | 18 +++++++++++++++++-
 3 files changed, 28 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +10 -0
index f355d9a..71aade0 100644
@@ -26,6 +26,7 @@
 
 #include <drm/drm_edid.h>
 #include <drm/drm_fb_helper.h>
+#include <drm/drm_dp_helper.h>
 #include <drm/drm_probe_helper.h>
 #include <drm/amdgpu_drm.h>
 #include "amdgpu.h"
@@ -1405,6 +1406,10 @@ amdgpu_connector_dp_detect(struct drm_connector *connector, bool force)
 		pm_runtime_put_autosuspend(connector->dev->dev);
 	}
 
+	drm_dp_set_subconnector_property(&amdgpu_connector->base,
+					 ret,
+					 amdgpu_dig_connector->dpcd,
+					 amdgpu_dig_connector->downstream_ports);
 	return ret;
 }
 
@@ -1951,6 +1956,11 @@ amdgpu_connector_add(struct amdgpu_device *adev,
 	if (has_aux)
 		amdgpu_atombios_dp_aux_init(amdgpu_connector);
 
+	if (connector_type == DRM_MODE_CONNECTOR_DisplayPort ||
+	    connector_type == DRM_MODE_CONNECTOR_eDP) {
+		drm_mode_add_dp_subconnector_property(&amdgpu_connector->base);
+	}
+
 	return;
 
 failed:
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +1 -0
index 37ba07e..04a430e 100644
@@ -469,6 +469,7 @@ struct amdgpu_encoder {
 struct amdgpu_connector_atom_dig {
 	/* displayport */
 	u8 dpcd[DP_RECEIVER_CAP_SIZE];
+	u8 downstream_ports[DP_MAX_DOWNSTREAM_PORTS];
 	u8 dp_sink_type;
 	int dp_clock;
 	int dp_lane_count;
drivers/gpu/drm/amd/amdgpu/atombios_dp.c +17 -1
index 9b74cfd..900b272 100644
@@ -328,6 +328,22 @@ static void amdgpu_atombios_dp_probe_oui(struct amdgpu_connector *amdgpu_connect
 			      buf[0], buf[1], buf[2]);
 }
 
+static void amdgpu_atombios_dp_ds_ports(struct amdgpu_connector *amdgpu_connector)
+{
+	struct amdgpu_connector_atom_dig *dig_connector = amdgpu_connector->con_priv;
+	int ret;
+
+	if (dig_connector->dpcd[DP_DPCD_REV] > 0x10) {
+		ret = drm_dp_dpcd_read(&amdgpu_connector->ddc_bus->aux,
+				       DP_DOWNSTREAM_PORT_0,
+				       dig_connector->downstream_ports,
+				       DP_MAX_DOWNSTREAM_PORTS);
+		if (ret)
+			memset(dig_connector->downstream_ports, 0,
+			       DP_MAX_DOWNSTREAM_PORTS);
+	}
+}
+
 int amdgpu_atombios_dp_get_dpcd(struct amdgpu_connector *amdgpu_connector)
 {
 	struct amdgpu_connector_atom_dig *dig_connector = amdgpu_connector->con_priv;
@@ -343,7 +359,7 @@ int amdgpu_atombios_dp_get_dpcd(struct amdgpu_connector *amdgpu_connector)
 			      dig_connector->dpcd);
 
 		amdgpu_atombios_dp_probe_oui(amdgpu_connector);
-
+		amdgpu_atombios_dp_ds_ports(amdgpu_connector);
 		return 0;
 	}
 
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#6 lore raw

Re: [Intel-gfx] [PATCH 4/5] drm/amdgpu: utilize subconnector property for DP through atombios

Alex, Harry, Christian, can you please eyeball this series and see if it makes sense for you?

Thanks,
Jani.

Quoted 103 lines · Jeevan B

From: Oleg Vasilev <[email protected]>

Since DP-specific information is stored in driver's structures, every driver needs to implement subconnector property by itself.

v2: rebase

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 10 ++++++++++
 drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h       |  1 +
 drivers/gpu/drm/amd/amdgpu/atombios_dp.c       | 18 +++++++++++++++++-
 3 files changed, 28 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +10 -0
index f355d9a..71aade0 100644
@@ -26,6 +26,7 @@
 
 #include <drm/drm_edid.h>
 #include <drm/drm_fb_helper.h>
+#include <drm/drm_dp_helper.h>
 #include <drm/drm_probe_helper.h>
 #include <drm/amdgpu_drm.h>
 #include "amdgpu.h"
@@ -1405,6 +1406,10 @@ amdgpu_connector_dp_detect(struct drm_connector *connector, bool force)
 		pm_runtime_put_autosuspend(connector->dev->dev);
 	}
 
+	drm_dp_set_subconnector_property(&amdgpu_connector->base,
+					 ret,
+					 amdgpu_dig_connector->dpcd,
+					 amdgpu_dig_connector->downstream_ports);
 	return ret;
 }
 
@@ -1951,6 +1956,11 @@ amdgpu_connector_add(struct amdgpu_device *adev,
 	if (has_aux)
 		amdgpu_atombios_dp_aux_init(amdgpu_connector);
 
+	if (connector_type == DRM_MODE_CONNECTOR_DisplayPort ||
+	    connector_type == DRM_MODE_CONNECTOR_eDP) {
+		drm_mode_add_dp_subconnector_property(&amdgpu_connector->base);
+	}
+
 	return;
 
 failed:
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +1 -0
index 37ba07e..04a430e 100644
@@ -469,6 +469,7 @@ struct amdgpu_encoder {
 struct amdgpu_connector_atom_dig {
 	/* displayport */
 	u8 dpcd[DP_RECEIVER_CAP_SIZE];
+	u8 downstream_ports[DP_MAX_DOWNSTREAM_PORTS];
 	u8 dp_sink_type;
 	int dp_clock;
 	int dp_lane_count;
drivers/gpu/drm/amd/amdgpu/atombios_dp.c +17 -1
index 9b74cfd..900b272 100644
@@ -328,6 +328,22 @@ static void amdgpu_atombios_dp_probe_oui(struct amdgpu_connector *amdgpu_connect
 			      buf[0], buf[1], buf[2]);
 }
 
+static void amdgpu_atombios_dp_ds_ports(struct amdgpu_connector *amdgpu_connector)
+{
+	struct amdgpu_connector_atom_dig *dig_connector = amdgpu_connector->con_priv;
+	int ret;
+
+	if (dig_connector->dpcd[DP_DPCD_REV] > 0x10) {
+		ret = drm_dp_dpcd_read(&amdgpu_connector->ddc_bus->aux,
+				       DP_DOWNSTREAM_PORT_0,
+				       dig_connector->downstream_ports,
+				       DP_MAX_DOWNSTREAM_PORTS);
+		if (ret)
+			memset(dig_connector->downstream_ports, 0,
+			       DP_MAX_DOWNSTREAM_PORTS);
+	}
+}
+
 int amdgpu_atombios_dp_get_dpcd(struct amdgpu_connector *amdgpu_connector)
 {
 	struct amdgpu_connector_atom_dig *dig_connector = amdgpu_connector->con_priv;
@@ -343,7 +359,7 @@ int amdgpu_atombios_dp_get_dpcd(struct amdgpu_connector *amdgpu_connector)
 			      dig_connector->dpcd);
 
 		amdgpu_atombios_dp_probe_oui(amdgpu_connector);
-
+		amdgpu_atombios_dp_ds_ports(amdgpu_connector);
 		return 0;
 	}
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Acked-by
#7 lore raw

Re: [Intel-gfx] [PATCH 4/5] drm/amdgpu: utilize subconnector property for DP through atombios

Quoted 5 lines · Jani Nikula

Alex, Harry, Christian, can you please eyeball this series and see if it makes sense for you?

Patches 4, 5 are:

Feel free to take them through whichever tree you want.

Alex

Quoted 103 lines

Thanks,
Jani.

Quoted 98 lines · Jeevan B

From: Oleg Vasilev <[email protected]>

Since DP-specific information is stored in driver's structures, every driver needs to implement subconnector property by itself.

v2: rebase

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 10 ++++++++++
 drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h       |  1 +
 drivers/gpu/drm/amd/amdgpu/atombios_dp.c       | 18 +++++++++++++++++-
 3 files changed, 28 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +10 -0
index f355d9a..71aade0 100644
@@ -26,6 +26,7 @@
 
 #include <drm/drm_edid.h>
 #include <drm/drm_fb_helper.h>
+#include <drm/drm_dp_helper.h>
 #include <drm/drm_probe_helper.h>
 #include <drm/amdgpu_drm.h>
 #include "amdgpu.h"
@@ -1405,6 +1406,10 @@ amdgpu_connector_dp_detect(struct drm_connector *connector, bool force)
              pm_runtime_put_autosuspend(connector->dev->dev);
      }
 
+     drm_dp_set_subconnector_property(&amdgpu_connector->base,
+                                      ret,
+                                      amdgpu_dig_connector->dpcd,
+                                      amdgpu_dig_connector->downstream_ports);
      return ret;
 }
 
@@ -1951,6 +1956,11 @@ amdgpu_connector_add(struct amdgpu_device *adev,
      if (has_aux)
              amdgpu_atombios_dp_aux_init(amdgpu_connector);
 
+     if (connector_type == DRM_MODE_CONNECTOR_DisplayPort ||
+         connector_type == DRM_MODE_CONNECTOR_eDP) {
+             drm_mode_add_dp_subconnector_property(&amdgpu_connector->base);
+     }
+
      return;
 
 failed:
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +1 -0
index 37ba07e..04a430e 100644
@@ -469,6 +469,7 @@ struct amdgpu_encoder {
 struct amdgpu_connector_atom_dig {
      /* displayport */
      u8 dpcd[DP_RECEIVER_CAP_SIZE];
+     u8 downstream_ports[DP_MAX_DOWNSTREAM_PORTS];
      u8 dp_sink_type;
      int dp_clock;
      int dp_lane_count;
drivers/gpu/drm/amd/amdgpu/atombios_dp.c +16 -0
index 9b74cfd..900b272 100644
@@ -328,6 +328,22 @@ static void amdgpu_atombios_dp_probe_oui(struct amdgpu_connector *amdgpu_connect
                            buf[0], buf[1], buf[2]);
 }
 
+static void amdgpu_atombios_dp_ds_ports(struct amdgpu_connector *amdgpu_connector)
+{
+     struct amdgpu_connector_atom_dig *dig_connector = amdgpu_connector->con_priv;
+     int ret;
+
+     if (dig_connector->dpcd[DP_DPCD_REV] > 0x10) {
+             ret = drm_dp_dpcd_read(&amdgpu_connector->ddc_bus->aux,
+                                    DP_DOWNSTREAM_PORT_0,
+                                    dig_connector->downstream_ports,
+                                    DP_MAX_DOWNSTREAM_PORTS);
+             if (ret)
+                     memset(dig_connector->downstream_ports, 0,
+                            DP_MAX_DOWNSTREAM_PORTS);
+     }
+}
+
 int amdgpu_atombios_dp_get_dpcd(struct amdgpu_connector *amdgpu_connector)
 {
      struct amdgpu_connector_atom_dig *dig_connector = amdgpu_connector->con_priv;
@@ -343,7 +359,7 @@ int amdgpu_atombios_dp_get_dpcd(struct amdgpu_connector *amdgpu_connector)
                            dig_connector->dpcd);
 
Quoted 12 lines

drivers/gpu/drm/amd/amdgpu/atombios_dp.c int amdgpu_atombios_dp_get_dpcd(struct amdgpu_connector *amdgpu_connector) · line 364

Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/atombios_dp.c +1 -1
              amdgpu_atombios_dp_probe_oui(amdgpu_connector);
-
+             amdgpu_atombios_dp_ds_ports(amdgpu_connector);
              return 0;
      }

--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#8 lore raw

Re: [Intel-gfx] [PATCH 4/5] drm/amdgpu: utilize subconnector property for DP through atombios

Quoted 10 lines · Alex Deucher
Quoted 5 lines · Jani Nikula

Alex, Harry, Christian, can you please eyeball this series and see if it makes sense for you?

Patches 4, 5 are:

Feel free to take them through whichever tree you want.

Thanks a bunch! I'll let you know.

BR,
Jani.

Quoted 119 lines

Alex

Quoted 115 lines

Thanks,
Jani.

Quoted 96 lines · Jeevan B

From: Oleg Vasilev <[email protected]>

Since DP-specific information is stored in driver's structures, every driver needs to implement subconnector property by itself.

v2: rebase

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 10 ++++++++++
 drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h       |  1 +
 drivers/gpu/drm/amd/amdgpu/atombios_dp.c       | 18 +++++++++++++++++-
 3 files changed, 28 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +10 -0
index f355d9a..71aade0 100644
@@ -26,6 +26,7 @@
 
 #include <drm/drm_edid.h>
 #include <drm/drm_fb_helper.h>
+#include <drm/drm_dp_helper.h>
 #include <drm/drm_probe_helper.h>
 #include <drm/amdgpu_drm.h>
 #include "amdgpu.h"
@@ -1405,6 +1406,10 @@ amdgpu_connector_dp_detect(struct drm_connector *connector, bool force)
              pm_runtime_put_autosuspend(connector->dev->dev);
      }
 
+     drm_dp_set_subconnector_property(&amdgpu_connector->base,
+                                      ret,
+                                      amdgpu_dig_connector->dpcd,
+                                      amdgpu_dig_connector->downstream_ports);
      return ret;
 }
 
@@ -1951,6 +1956,11 @@ amdgpu_connector_add(struct amdgpu_device *adev,
      if (has_aux)
              amdgpu_atombios_dp_aux_init(amdgpu_connector);
 
+     if (connector_type == DRM_MODE_CONNECTOR_DisplayPort ||
+         connector_type == DRM_MODE_CONNECTOR_eDP) {
+             drm_mode_add_dp_subconnector_property(&amdgpu_connector->base);
+     }
+
      return;
 
 failed:
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +1 -0
index 37ba07e..04a430e 100644
@@ -469,6 +469,7 @@ struct amdgpu_encoder {
 struct amdgpu_connector_atom_dig {
      /* displayport */
      u8 dpcd[DP_RECEIVER_CAP_SIZE];
+     u8 downstream_ports[DP_MAX_DOWNSTREAM_PORTS];
      u8 dp_sink_type;
      int dp_clock;
      int dp_lane_count;
drivers/gpu/drm/amd/amdgpu/atombios_dp.c +16 -0
index 9b74cfd..900b272 100644
@@ -328,6 +328,22 @@ static void amdgpu_atombios_dp_probe_oui(struct amdgpu_connector *amdgpu_connect
                            buf[0], buf[1], buf[2]);
 }
 
+static void amdgpu_atombios_dp_ds_ports(struct amdgpu_connector *amdgpu_connector)
+{
+     struct amdgpu_connector_atom_dig *dig_connector = amdgpu_connector->con_priv;
+     int ret;
+
+     if (dig_connector->dpcd[DP_DPCD_REV] > 0x10) {
+             ret = drm_dp_dpcd_read(&amdgpu_connector->ddc_bus->aux,
+                                    DP_DOWNSTREAM_PORT_0,
+                                    dig_connector->downstream_ports,
+                                    DP_MAX_DOWNSTREAM_PORTS);
+             if (ret)
+                     memset(dig_connector->downstream_ports, 0,
+                            DP_MAX_DOWNSTREAM_PORTS);
+     }
+}
+
 int amdgpu_atombios_dp_get_dpcd(struct amdgpu_connector *amdgpu_connector)
 {
      struct amdgpu_connector_atom_dig *dig_connector = amdgpu_connector->con_priv;

drivers/gpu/drm/amd/amdgpu/atombios_dp.c int amdgpu_atombios_dp_get_dpcd(struct amdgpu_connector *amdgpu_connector) · line 364

Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/atombios_dp.c +1 -1
@@ -343,7 +359,7 @@ int amdgpu_atombios_dp_get_dpcd(struct amdgpu_connector *amdgpu_connector)
                            dig_connector->dpcd);
 
              amdgpu_atombios_dp_probe_oui(amdgpu_connector);
-
+             amdgpu_atombios_dp_ds_ports(amdgpu_connector);
              return 0;
      }

--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
author
#9 lore raw

PATCH 5/5 drm/amdgpu: utilize subconnector property for DP through DisplayManager

In reply to Jeevan B

From: Oleg Vasilev <[email protected]>

Since DP-specific information is stored in driver's structures, every driver needs to implement subconnector property by itself. Display Core already has the subconnector information, we only need to expose it through DRM property.

v2:rebase

---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c  | 41 +++++++++++++++++++++-
 .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c    |  3 ++
 2 files changed, 43 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +40 -1
index d3674d8..91c0ef2 100644
@@ -121,6 +121,42 @@ MODULE_FIRMWARE(FIRMWARE_NAVI12_DMCU);
 static int amdgpu_dm_init(struct amdgpu_device *adev);
 static void amdgpu_dm_fini(struct amdgpu_device *adev);
 
+static enum drm_mode_subconnector get_subconnector_type(struct dc_link *link)
+{
+	switch (link->dpcd_caps.dongle_type) {
+	case DISPLAY_DONGLE_NONE:
+		return DRM_MODE_SUBCONNECTOR_Native;
+	case DISPLAY_DONGLE_DP_VGA_CONVERTER:
+		return DRM_MODE_SUBCONNECTOR_VGA;
+	case DISPLAY_DONGLE_DP_DVI_CONVERTER:
+	case DISPLAY_DONGLE_DP_DVI_DONGLE:
+		return DRM_MODE_SUBCONNECTOR_DVID;
+	case DISPLAY_DONGLE_DP_HDMI_CONVERTER:
+	case DISPLAY_DONGLE_DP_HDMI_DONGLE:
+		return DRM_MODE_SUBCONNECTOR_HDMIA;
+	case DISPLAY_DONGLE_DP_HDMI_MISMATCHED_DONGLE:
+	default:
+		return DRM_MODE_SUBCONNECTOR_Unknown;
+	}
+}
+
+static void update_subconnector_property(struct amdgpu_dm_connector *aconnector)
+{
+	struct dc_link *link = aconnector->dc_link;
+	struct drm_connector *connector = &aconnector->base;
+	enum drm_mode_subconnector subconnector = DRM_MODE_SUBCONNECTOR_Unknown;
+
+	if (connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort)
+		return;
+
+	if (aconnector->dc_sink)
+		subconnector = get_subconnector_type(link);
+
+	drm_object_property_set_value(&connector->base,
+			connector->dev->mode_config.dp_subconnector_property,
+			subconnector);
+}
+
 /*
  * initializes drm_device display related structures, based on the information
  * provided by DAL. The drm strcutures are: drm_crtc, drm_connector,
@@ -1917,7 +1953,6 @@ void amdgpu_dm_update_connector_after_detect(
 	if (aconnector->mst_mgr.mst_state == true)
 		return;
 
-
 	sink = aconnector->dc_link->local_sink;
 	if (sink)
 		dc_sink_retain(sink);
@@ -2038,6 +2073,8 @@ void amdgpu_dm_update_connector_after_detect(
 
 	mutex_unlock(&dev->mode_config.mutex);
 
+	update_subconnector_property(aconnector);
+
 	if (sink)
 		dc_sink_release(sink);
 }
@@ -4518,6 +4555,8 @@ amdgpu_dm_connector_detect(struct drm_connector *connector, bool force)
 	else
 		connected = (aconnector->base.force == DRM_FORCE_ON);
 
+	update_subconnector_property(aconnector);
+
 	return (connected ? connector_status_connected :
 			connector_status_disconnected);
 }
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +3 -0
index d56b758..267c82c 100644
@@ -26,6 +26,7 @@
 #include <linux/version.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_dp_mst_helper.h>
+#include <drm/drm_dp_helper.h>
 #include "dm_services.h"
 #include "amdgpu.h"
 #include "amdgpu_dm.h"
@@ -464,6 +465,8 @@ void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm,
 		16,
 		4,
 		aconnector->connector_id);
+
+	drm_mode_add_dp_subconnector_property(&aconnector->base);
 }
 
 int dm_mst_get_pbn_divider(struct dc_link *link)
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#10 lore raw

[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/5] drm: report dp downstream port type as a subconnector property

In reply to Jeevan B
== Series Details ==

== Series Details ==

Series: series starting with [1/5] drm: report dp downstream port type as a subconnector property
URL : https://patchwork.freedesktop.org/series/75585/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
4bd9a33efdc0 drm: report dp downstream port type as a subconnector property
-:54: CHECK:CAMELCASE: Avoid CamelCase: <DRM_MODE_SUBCONNECTOR_Unknown>
#54: FILE: drivers/gpu/drm/drm_connector.c:847:
+	{ DRM_MODE_SUBCONNECTOR_Unknown,   "Unknown"   }, /* DVI-I, TV-out and DP */

-:76: CHECK:CAMELCASE: Avoid CamelCase: <DRM_MODE_SUBCONNECTOR_DisplayPort> #76: FILE: drivers/gpu/drm/drm_connector.c:878:
+ { DRM_MODE_SUBCONNECTOR_DisplayPort, "DP" }, /* DP */

-:77: CHECK:CAMELCASE: Avoid CamelCase: <DRM_MODE_SUBCONNECTOR_Wireless> #77: FILE: drivers/gpu/drm/drm_connector.c:879:
+ { DRM_MODE_SUBCONNECTOR_Wireless, "Wireless" }, /* DP */

-:78: CHECK:CAMELCASE: Avoid CamelCase: <DRM_MODE_SUBCONNECTOR_Native> #78: FILE: drivers/gpu/drm/drm_connector.c:880:
+ { DRM_MODE_SUBCONNECTOR_Native, "Native" }, /* DP */

-:119: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #119: FILE: drivers/gpu/drm/drm_connector.c:1311:
+ drm_property_create_enum(connector->dev,
+ DRM_MODE_PROP_IMMUTABLE,

-:152: WARNING:LINE_SPACING: Missing a blank line after declarations #152: FILE: drivers/gpu/drm/drm_dp_helper.c:608:
+ int type;
+ if (!drm_dp_is_branch(dpcd))

-:213: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #213: FILE: drivers/gpu/drm/drm_dp_helper.c:669:
+ drm_object_property_set_value(&connector->base,
+ connector->dev->mode_config.dp_subconnector_property,

-:298: CHECK:CAMELCASE: Avoid CamelCase: <DRM_MODE_SUBCONNECTOR_Automatic> #298: FILE: include/uapi/drm/drm_mode.h:335:
+ DRM_MODE_SUBCONNECTOR_Automatic = 0, /* DVI-I, TV */

-:303: CHECK:CAMELCASE: Avoid CamelCase: <DRM_MODE_SUBCONNECTOR_Composite> #303: FILE: include/uapi/drm/drm_mode.h:340:
+ DRM_MODE_SUBCONNECTOR_Composite = 5, /* TV */

-:305: CHECK:CAMELCASE: Avoid CamelCase: <DRM_MODE_SUBCONNECTOR_Component> #305: FILE: include/uapi/drm/drm_mode.h:342:
+ DRM_MODE_SUBCONNECTOR_Component = 8, /* TV */

total: 0 errors, 1 warnings, 9 checks, 234 lines checked d2c8d8547c2a drm/i915: utilize subconnector property for DP 2dfa92187ee6 drm/nouveau: utilize subconnector property for DP -:28: CHECK:CAMELCASE: Avoid CamelCase: <DRM_MODE_SUBCONNECTOR_Unknown> #28: FILE: drivers/gpu/drm/nouveau/nouveau_connector.c:653:
+ enum drm_mode_subconnector subconnector = DRM_MODE_SUBCONNECTOR_Unknown;

-:33: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #33: FILE: drivers/gpu/drm/nouveau/nouveau_connector.c:658:
+ drm_object_property_set_value(&connector->base,
+ connector->dev->mode_config.dp_subconnector_property,

total: 0 errors, 0 warnings, 2 checks, 53 lines checked
39a32c6dd117 drm/amdgpu: utilize subconnector property for DP through atombios 492358bb545e drm/amdgpu: utilize subconnector property for DP through DisplayManager -:38: CHECK:CAMELCASE: Avoid CamelCase: <DRM_MODE_SUBCONNECTOR_Native> #38: FILE: drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c:128:
+ return DRM_MODE_SUBCONNECTOR_Native;

-:49: CHECK:CAMELCASE: Avoid CamelCase: <DRM_MODE_SUBCONNECTOR_Unknown> #49: FILE: drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c:139:
+ return DRM_MODE_SUBCONNECTOR_Unknown;

-:66: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #66: FILE: drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c:156:
+ drm_object_property_set_value(&connector->base,
+ connector->dev->mode_config.dp_subconnector_property,

total: 0 errors, 0 warnings, 3 checks, 80 lines checked

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#11 lore raw

[Intel-gfx] ✗ Fi.CI.SPARSE: warning for series starting with [1/5] drm: report dp downstream port type as a subconnector property

In reply to Jeevan B
== Series Details ==

== Series Details ==

Series: series starting with [1/5] drm: report dp downstream port type as a subconnector property
URL : https://patchwork.freedesktop.org/series/75585/
State : warning

== Summary ==

$ dim sparse origin/drm-tip
Sparse version: v0.6.0
Commit: drm: report dp downstream port type as a subconnector property
Okay!

Commit: drm/i915: utilize subconnector property for DP Okay!

Commit: drm/nouveau: utilize subconnector property for DP Okay!

Commit: drm/amdgpu: utilize subconnector property for DP through atombios Okay!

Commit: drm/amdgpu: utilize subconnector property for DP through DisplayManager -drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1154:17: warning: cast to restricted __le32 -drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1154:17: warning: cast to restricted __le32 -drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1154:17: warning: cast to restricted __le32 -drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1154:17: warning: cast to restricted __le32 -drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1154:17: warning: cast to restricted __le32 -drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1154:17: warning: cast to restricted __le32 -drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1159:17: warning: cast to restricted __le32 -drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1159:17: warning: cast to restricted __le32 -drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1159:17: warning: cast to restricted __le32 -drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1161:36: warning: cast to restricted __le32 -drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1228:25: warning: cast to restricted __le32 -drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1228:25: warning: cast to restricted __le32 -drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1228:25: warning: cast to restricted __le32 -drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1234:37: warning: cast to restricted __le32 -drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1260:41: warning: cast to restricted __le32 -drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1262:39: warning: cast to restricted __le32 -drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1266:17: warning: cast to restricted __le32 -drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1267:17: warning: cast to restricted __le32 -drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:2511:24: warning: symbol 'dm_atomic_get_new_state' was not declared. Should it be static? -drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:2529:24: warning: symbol 'dm_atomic_get_old_state' was not declared. Should it be static? -drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:5298:6: warning: symbol 'dm_drm_plane_destroy_state' was not declared. Should it be static? -drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:750:6: warning: symbol 'amdgpu_dm_audio_eld_notify' was not declared. Should it be static? -drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:805:25: warning: cast to restricted __le32 -drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:809:23: warning: cast to restricted __le32 -drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:810:23: warning: cast to restricted __le32 -drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:813:30: warning: cast to restricted __le32 -drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:816:28: warning: cast to restricted __le32 -drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:8632:6: warning: symbol 'amdgpu_dm_psr_enable' was not declared. Should it be static? -drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:8636:50: warning: missing braces around initializer +drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1190:17: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1190:17: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1190:17: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1190:17: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1190:17: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1190:17: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1195:17: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1195:17: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1195:17: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1197:36: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1264:25: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1264:25: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1264:25: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1270:37: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1296:41: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1298:39: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1302:17: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1303:17: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:2548:24: warning: symbol 'dm_atomic_get_new_state' was not declared. Should it be static? +drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:2566:24: warning: symbol 'dm_atomic_get_old_state' was not declared. Should it be static? +drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:5337:6: warning: symbol 'dm_drm_plane_destroy_state' was not declared. Should it be static? +drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:786:6: warning: symbol 'amdgpu_dm_audio_eld_notify' was not declared. Should it be static? +drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:841:25: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:845:23: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:846:23: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:849:30: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:852:28: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:8671:6: warning: symbol 'amdgpu_dm_psr_enable' was not declared. Should it be static? +drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:8675:50: warning: missing braces around initializer

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#12 lore raw

[Intel-gfx] ✓ Fi.CI.BAT: success for series starting with [1/5] drm: report dp downstream port type as a subconnector property

In reply to Jeevan B
== Series Details ==

== Series Details ==

Series: series starting with [1/5] drm: report dp downstream port type as a subconnector property
URL : https://patchwork.freedesktop.org/series/75585/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_8264 -> Patchwork_17228
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17228/index.html

Known issues
------------

Here are the changes found in Patchwork_17228 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@i915_selftest@live@requests:
- fi-icl-u2: [PASS][1] -> [INCOMPLETE][2] ([i915#1531] / [i915#1581])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/fi-icl-u2/igt@i915_selftest@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17228/fi-icl-u2/igt@i915_selftest@[email protected]

* igt@kms_chamelium@dp-edid-read:
- fi-cml-u2: [PASS][3] -> [FAIL][4] ([i915#976])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/fi-cml-u2/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17228/fi-cml-u2/igt@[email protected]

#### Possible fixes ####

* igt@gem_exec_suspend@basic-s4-devices:
- fi-tgl-y: [FAIL][5] ([i915#1158]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/fi-tgl-y/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17228/fi-tgl-y/igt@[email protected]

* igt@i915_selftest@live@hangcheck:
- fi-icl-y: [INCOMPLETE][7] ([i915#1580]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/fi-icl-y/igt@i915_selftest@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17228/fi-icl-y/igt@i915_selftest@[email protected]

[i915#1158]: https://gitlab.freedesktop.org/drm/intel/issues/1158
[i915#1531]: https://gitlab.freedesktop.org/drm/intel/issues/1531
[i915#1580]: https://gitlab.freedesktop.org/drm/intel/issues/1580
[i915#1581]: https://gitlab.freedesktop.org/drm/intel/issues/1581
[i915#976]: https://gitlab.freedesktop.org/drm/intel/issues/976

Participating hosts (53 -> 47)
------------------------------

Additional (1): fi-kbl-7560u
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus

Build changes
-------------

* CI: CI-20190529 -> None
* Linux: CI_DRM_8264 -> Patchwork_17228

CI-20190529: 20190529
CI_DRM_8264: e0104585f880a64d4a9b40803cf4fb51ab499f7c @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5573: 9c582425d6b4fc1de9fc2ffc8015cc6f0a0d3e98 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_17228: 492358bb545e27f7fe4f65d666c2930f954f2a0b @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

492358bb545e drm/amdgpu: utilize subconnector property for DP through DisplayManager 39a32c6dd117 drm/amdgpu: utilize subconnector property for DP through atombios 2dfa92187ee6 drm/nouveau: utilize subconnector property for DP d2c8d8547c2a drm/i915: utilize subconnector property for DP 4bd9a33efdc0 drm: report dp downstream port type as a subconnector property

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17228/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#13 lore raw

[Intel-gfx] ✓ Fi.CI.IGT: success for series starting with [1/5] drm: report dp downstream port type as a subconnector property

In reply to Jeevan B
== Series Details ==

== Series Details ==

Series: series starting with [1/5] drm: report dp downstream port type as a subconnector property
URL : https://patchwork.freedesktop.org/series/75585/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_8264_full -> Patchwork_17228_full
====================================================

Summary
-------

**SUCCESS**

No regressions found.

Known issues
------------

Here are the changes found in Patchwork_17228_full that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@kms_fbcon_fbt@fbc-suspend:
- shard-apl: [PASS][1] -> [DMESG-WARN][2] ([i915#180] / [i915#95])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-apl2/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17228/shard-apl1/igt@[email protected]

* igt@kms_flip@flip-vs-suspend:
- shard-apl: [PASS][3] -> [DMESG-WARN][4] ([i915#180])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-apl3/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17228/shard-apl1/igt@[email protected]

* igt@kms_flip@plain-flip-ts-check-interruptible:
- shard-glk: [PASS][5] -> [FAIL][6] ([i915#34])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-glk2/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17228/shard-glk1/igt@[email protected]
- shard-skl: [PASS][7] -> [FAIL][8] ([i915#34])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-skl6/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17228/shard-skl9/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [PASS][9] -> [FAIL][10] ([fdo#108145] / [i915#265])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-skl5/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17228/shard-skl10/igt@[email protected]

* igt@kms_psr@psr2_cursor_mmap_cpu:
- shard-iclb: [PASS][11] -> [SKIP][12] ([fdo#109441]) +2 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_cpu.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17228/shard-iclb4/igt@kms_psr@psr2_cursor_mmap_cpu.html

#### Possible fixes ####

* {igt@gem_ctx_isolation@preservation-s3@rcs0}:
- shard-apl: [DMESG-WARN][13] ([i915#180]) -> [PASS][14] +4 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-apl6/igt@gem_ctx_isolation@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17228/shard-apl2/igt@gem_ctx_isolation@[email protected]

* igt@gem_exec_balancer@hang:
- shard-tglb: [FAIL][15] ([i915#1277]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-tglb6/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17228/shard-tglb6/igt@[email protected]

* igt@gem_exec_params@invalid-bsd-ring:
- shard-iclb: [SKIP][17] ([fdo#109276]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-iclb7/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17228/shard-iclb2/igt@[email protected]

* igt@i915_pm_rc6_residency@rc6-idle:
- shard-hsw: [FAIL][19] ([i915#1516]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-hsw1/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17228/shard-hsw4/igt@[email protected]

* igt@i915_pm_rpm@basic-pci-d3-state:
- shard-skl: [FAIL][21] ([i915#138]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-skl5/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17228/shard-skl10/igt@[email protected]

* igt@i915_selftest@live@blt:
- shard-snb: [DMESG-FAIL][23] ([i915#1409]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-snb4/igt@i915_selftest@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17228/shard-snb1/igt@i915_selftest@[email protected]

* igt@i915_suspend@fence-restore-tiled2untiled:
- shard-skl: [INCOMPLETE][25] ([i915#69]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-skl3/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17228/shard-skl10/igt@[email protected]

* igt@kms_fbcon_fbt@fbc-suspend:
- shard-kbl: [DMESG-WARN][27] ([i915#180] / [i915#93] / [i915#95]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-kbl1/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17228/shard-kbl2/igt@[email protected]

* igt@kms_flip@2x-plain-flip-ts-check:
- shard-glk: [FAIL][29] ([i915#34]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-glk5/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17228/shard-glk8/igt@[email protected]

* igt@kms_flip@flip-vs-expired-vblank:
- shard-apl: [FAIL][31] ([i915#79]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-apl4/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17228/shard-apl8/igt@[email protected]

* igt@kms_flip@flip-vs-suspend-interruptible:
- shard-kbl: [DMESG-WARN][33] ([i915#180]) -> [PASS][34] +2 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-kbl3/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17228/shard-kbl7/igt@[email protected]

* igt@kms_hdr@bpc-switch-dpms:
- shard-skl: [FAIL][35] ([i915#1188]) -> [PASS][36] +1 similar issue
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-skl4/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17228/shard-skl8/igt@[email protected]

* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes:
- shard-snb: [DMESG-WARN][37] ([i915#42]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-snb6/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17228/shard-snb7/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-b-constant-alpha-min:
- shard-skl: [FAIL][39] ([fdo#108145] / [i915#265]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-skl8/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17228/shard-skl6/igt@[email protected]

* igt@kms_plane_lowres@pipe-a-tiling-none:
- shard-kbl: [DMESG-WARN][41] ([i915#165] / [i915#78]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-kbl2/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17228/shard-kbl4/igt@[email protected]

* igt@kms_psr@psr2_primary_page_flip:
- shard-iclb: [SKIP][43] ([fdo#109441]) -> [PASS][44] +3 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-iclb1/igt@kms_psr@psr2_primary_page_flip.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17228/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html

#### Warnings ####

* igt@i915_pm_dc@dc3co-vpb-simulation:
- shard-iclb: [SKIP][45] ([i915#658]) -> [SKIP][46] ([i915#588])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-iclb7/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17228/shard-iclb2/igt@[email protected]

* igt@i915_pm_dc@dc6-dpms:
- shard-tglb: [FAIL][47] ([i915#454]) -> [SKIP][48] ([i915#468])
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-tglb5/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17228/shard-tglb2/igt@[email protected]

* igt@i915_pm_rpm@modeset-pc8-residency-stress:
- shard-snb: [SKIP][49] ([fdo#109271]) -> [INCOMPLETE][50] ([i915#82])
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-snb2/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17228/shard-snb5/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-b-alpha-opaque-fb:
- shard-apl: [FAIL][51] ([fdo#108145] / [i915#265]) -> [FAIL][52] ([fdo#108145] / [i915#265] / [i915#95])
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-apl3/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17228/shard-apl7/igt@[email protected]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1277]: https://gitlab.freedesktop.org/drm/intel/issues/1277
[i915#138]: https://gitlab.freedesktop.org/drm/intel/issues/138
[i915#1409]: https://gitlab.freedesktop.org/drm/intel/issues/1409
[i915#1516]: https://gitlab.freedesktop.org/drm/intel/issues/1516
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#165]: https://gitlab.freedesktop.org/drm/intel/issues/165
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#34]: https://gitlab.freedesktop.org/drm/intel/issues/34
[i915#42]: https://gitlab.freedesktop.org/drm/intel/issues/42
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#468]: https://gitlab.freedesktop.org/drm/intel/issues/468
[i915#588]: https://gitlab.freedesktop.org/drm/intel/issues/588
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#69]: https://gitlab.freedesktop.org/drm/intel/issues/69
[i915#78]: https://gitlab.freedesktop.org/drm/intel/issues/78
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#82]: https://gitlab.freedesktop.org/drm/intel/issues/82
[i915#93]: https://gitlab.freedesktop.org/drm/intel/issues/93
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95

Participating hosts (10 -> 10)
------------------------------

No changes in participating hosts

Build changes
-------------

* CI: CI-20190529 -> None
* Linux: CI_DRM_8264 -> Patchwork_17228

CI-20190529: 20190529
CI_DRM_8264: e0104585f880a64d4a9b40803cf4fb51ab499f7c @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5573: 9c582425d6b4fc1de9fc2ffc8015cc6f0a0d3e98 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_17228: 492358bb545e27f7fe4f65d666c2930f954f2a0b @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17228/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#14 lore raw
In reply to Jeevan B
Quoted 28 lines · Jeevan B

From: Oleg Vasilev <[email protected]>

Currently, downstream port type is only reported in debugfs. This information should be considered important since it reflects the actual physical connector type. Some userspace (e.g. window compositors) may want to show this info to a user.

The 'subconnector' property is already utilized for DVI-I and TV-out for reporting connector subtype.

The initial motivation for this feature came from i2c test [1]. It is supposed to be skipped on VGA connectors, but it cannot detect VGA over DP and fails instead.

v2:
- Ville: utilized drm_dp_is_branch()
- Ville: implement DP 1.0 downstream type info
- Replaced create_dp_properties with add_dp_subconnector_property
- Added dp_set_subconnector_property helper

v4:
- Ville: add DP1.0 best assumption about subconnector
- Ville: assume DVI is DVI-D
- Ville: reuse Writeback enum value for Virtual subconnector
- Renamed #defines: HDMI -> HDMIA, DP -> DisplayPort

v5: rebase

Quoted 8 lines

[1]: https://bugs.freedesktop.org/show_bug.cgi?id=104097

High level looks fine to me, please see some nitpicks inline.

BR,
Jani.

Quoted 67 lines
---
 drivers/gpu/drm/drm_connector.c | 49 ++++++++++++++++++++++++--
 drivers/gpu/drm/drm_dp_helper.c | 77 +++++++++++++++++++++++++++++++++++++++++
 include/drm/drm_connector.h     |  3 ++
 include/drm/drm_dp_helper.h     |  8 +++++
 include/drm/drm_mode_config.h   |  6 ++++
 include/uapi/drm/drm_mode.h     | 21 ++++++-----
 6 files changed, 154 insertions(+), 10 deletions(-)
drivers/gpu/drm/drm_connector.c +23 -2
index b1099e1..b6972d1 100644
@@ -844,7 +844,7 @@ static const struct drm_prop_enum_list drm_dvi_i_select_enum_list[] = {
 DRM_ENUM_NAME_FN(drm_get_dvi_i_select_name, drm_dvi_i_select_enum_list)
 
 static const struct drm_prop_enum_list drm_dvi_i_subconnector_enum_list[] = {
-	{ DRM_MODE_SUBCONNECTOR_Unknown,   "Unknown"   }, /* DVI-I and TV-out */
+	{ DRM_MODE_SUBCONNECTOR_Unknown,   "Unknown"   }, /* DVI-I, TV-out and DP */
 	{ DRM_MODE_SUBCONNECTOR_DVID,      "DVI-D"     }, /* DVI-I  */
 	{ DRM_MODE_SUBCONNECTOR_DVIA,      "DVI-A"     }, /* DVI-I  */
 };
@@ -861,7 +861,7 @@ static const struct drm_prop_enum_list drm_tv_select_enum_list[] = {
 DRM_ENUM_NAME_FN(drm_get_tv_select_name, drm_tv_select_enum_list)
 
 static const struct drm_prop_enum_list drm_tv_subconnector_enum_list[] = {
-	{ DRM_MODE_SUBCONNECTOR_Unknown,   "Unknown"   }, /* DVI-I and TV-out */
+	{ DRM_MODE_SUBCONNECTOR_Unknown,   "Unknown"   }, /* DVI-I, TV-out and DP */
 	{ DRM_MODE_SUBCONNECTOR_Composite, "Composite" }, /* TV-out */
 	{ DRM_MODE_SUBCONNECTOR_SVIDEO,    "SVIDEO"    }, /* TV-out */
 	{ DRM_MODE_SUBCONNECTOR_Component, "Component" }, /* TV-out */
@@ -870,6 +870,19 @@ static const struct drm_prop_enum_list drm_tv_subconnector_enum_list[] = {
 DRM_ENUM_NAME_FN(drm_get_tv_subconnector_name,
 		 drm_tv_subconnector_enum_list)
 
+static const struct drm_prop_enum_list drm_dp_subconnector_enum_list[] = {
+	{ DRM_MODE_SUBCONNECTOR_Unknown,     "Unknown"   }, /* DVI-I, TV-out and DP */
+	{ DRM_MODE_SUBCONNECTOR_VGA,	     "VGA"       }, /* DP */
+	{ DRM_MODE_SUBCONNECTOR_DVID,	     "DVI-D"     }, /* DP */
+	{ DRM_MODE_SUBCONNECTOR_HDMIA,	     "HDMI"      }, /* DP */
+	{ DRM_MODE_SUBCONNECTOR_DisplayPort, "DP"        }, /* DP */
+	{ DRM_MODE_SUBCONNECTOR_Wireless,    "Wireless"  }, /* DP */
+	{ DRM_MODE_SUBCONNECTOR_Native,	     "Native"    }, /* DP */
+};
+
+DRM_ENUM_NAME_FN(drm_get_dp_subconnector_name,
+		 drm_dp_subconnector_enum_list)
+
 static const struct drm_prop_enum_list hdmi_colorspaces[] = {
 	/* For Default case, driver will set the colorspace */
 	{ DRM_MODE_COLORIMETRY_DEFAULT, "Default" },
@@ -1186,6 +1199,14 @@ static const struct drm_prop_enum_list dp_colorspaces[] = {
  *	can also expose this property to external outputs, in which case they
  *	must support "None", which should be the default (since external screens
  *	have a built-in scaler).
+ *
+ * subconnector:
+ *	This property is used by DVI-I, TVout and DisplayPort to indicate different
+ *	connector subtypes. Enum values more or less match with those from main
+ *	connector types.
+ *	For DVI-I and TVout there is also a matching property "select subconnector"
+ *	allowing to switch between signal types.
+ *	DP subconnector corresponds to a downstream port.
  */
 
 int drm_connector_create_standard_properties(struct drm_device *dev)

drivers/gpu/drm/drm_connector.c int drm_mode_create_dvi_i_properties(struct drm_device *dev) · line 1305

Quoted 10 lines
drivers/gpu/drm/drm_connector.c +7 -0
@@ -1275,6 +1296,30 @@ int drm_mode_create_dvi_i_properties(struct drm_device *dev)
 EXPORT_SYMBOL(drm_mode_create_dvi_i_properties);
 
 /**
+ * drm_mode_add_dp_subconnector_property - create subconnector property for DP
+ * @connector: drm_connector to attach property
+ *
+ * Called by a driver when DP connector is created.
+ */
+void drm_mode_add_dp_subconnector_property(struct drm_connector *connector)
+{

So far most functions dealing with properties are named:

- drm_mode_create_*
- drm_connector_attach_*

Sometimes the latter calling the former, sometimes creating inline.

drm_mode_add_* that attaches a property on a connector is confusing.

Perhaps call it drm_connector_attach_dp_subconnector_property().

Quoted 25 lines
drivers/gpu/drm/drm_connector.c +17 -0
+	struct drm_mode_config *mode_config = &connector->dev->mode_config;
+
+	if (!mode_config->dp_subconnector_property)
+		mode_config->dp_subconnector_property =
+			drm_property_create_enum(connector->dev,
+				DRM_MODE_PROP_IMMUTABLE,
+				"subconnector",
+				drm_dp_subconnector_enum_list,
+				ARRAY_SIZE(drm_dp_subconnector_enum_list));
+
+	drm_object_attach_property(&connector->base,
+				   mode_config->dp_subconnector_property,
+				   DRM_MODE_SUBCONNECTOR_Unknown);
+}
+EXPORT_SYMBOL(drm_mode_add_dp_subconnector_property);
+
+/**
  * DOC: HDMI connector properties
  *
  * content type (HDMI specific):
drivers/gpu/drm/drm_dp_helper.c +0 -0
index 8ba4531..5d5b50f 100644

drivers/gpu/drm/drm_dp_helper.c void drm_dp_downstream_debug(struct seq_file *m, · line 600

Quoted 7 lines
drivers/gpu/drm/drm_dp_helper.c +4 -0
@@ -594,6 +594,83 @@ void drm_dp_downstream_debug(struct seq_file *m,
 }
 EXPORT_SYMBOL(drm_dp_downstream_debug);
 
+/**
+ * drm_dp_subconnector_type() - get DP branch device type
+ * @dpcd: DisplayPort configuration data
+ * @port_cap: port capabilities

This does not help at all. What should this point at?

Quoted 45 lines
drivers/gpu/drm/drm_dp_helper.c +45 -0
+ *
+ */
+enum drm_mode_subconnector
+drm_dp_subconnector_type(const u8 dpcd[DP_RECEIVER_CAP_SIZE],
+			 const u8 port_cap[4])
+{
+	int type;
+	if (!drm_dp_is_branch(dpcd))
+		return DRM_MODE_SUBCONNECTOR_Native;
+	/* DP 1.0 approach */
+	if (dpcd[DP_DPCD_REV] == DP_DPCD_REV_10) {
+		type = dpcd[DP_DOWNSTREAMPORT_PRESENT] &
+		       DP_DWN_STRM_PORT_TYPE_MASK;
+
+		switch (type) {
+		case DP_DWN_STRM_PORT_TYPE_TMDS:
+			/* Can be HDMI or DVI-D, DVI-D is a safer option */
+			return DRM_MODE_SUBCONNECTOR_DVID;
+		case DP_DWN_STRM_PORT_TYPE_ANALOG:
+			/* Can be VGA or DVI-A, VGA is more popular */
+			return DRM_MODE_SUBCONNECTOR_VGA;
+		case DP_DWN_STRM_PORT_TYPE_DP:
+			return DRM_MODE_SUBCONNECTOR_DisplayPort;
+		case DP_DWN_STRM_PORT_TYPE_OTHER:
+		default:
+			return DRM_MODE_SUBCONNECTOR_Unknown;
+		}
+	}
+	type = port_cap[0] & DP_DS_PORT_TYPE_MASK;
+
+	switch (type) {
+	case DP_DS_PORT_TYPE_DP:
+	case DP_DS_PORT_TYPE_DP_DUALMODE:
+		return DRM_MODE_SUBCONNECTOR_DisplayPort;
+	case DP_DS_PORT_TYPE_VGA:
+		return DRM_MODE_SUBCONNECTOR_VGA;
+	case DP_DS_PORT_TYPE_DVI:
+		return DRM_MODE_SUBCONNECTOR_DVID;
+	case DP_DS_PORT_TYPE_HDMI:
+		return DRM_MODE_SUBCONNECTOR_HDMIA;
+	case DP_DS_PORT_TYPE_WIRELESS:
+		return DRM_MODE_SUBCONNECTOR_Wireless;
+	case DP_DS_PORT_TYPE_NON_EDID:
+	default:
+		return DRM_MODE_SUBCONNECTOR_Unknown;

drivers/gpu/drm/drm_dp_helper.c void drm_dp_downstream_debug(struct seq_file *m, · line 655

Quoted 10 lines
drivers/gpu/drm/drm_dp_helper.c +10 -0
+	}
+}
+EXPORT_SYMBOL(drm_dp_subconnector_type);
+
+/**
+ * drm_mode_set_dp_subconnector_property - set subconnector for DP connector
+ * @connector: dp connector to attach property
+ * @status: connector status which is about to be set
+ * @dpcd: DisplayPort configuration data
+ * @port_cap: port capabilities

Unhelpful documentation. Sure port_cap is port capabilities, but what should this point at? (I can tell looking at the code, but what's the point of documentation if you have to look at the code?)

drivers/gpu/drm/drm_dp_helper.c void drm_dp_downstream_debug(struct seq_file *m, · line 662

Quoted 7 lines
drivers/gpu/drm/drm_dp_helper.c +7 -0
+ *
+ * Called by a driver on every detect event.
+ */
+void drm_dp_set_subconnector_property(struct drm_connector *connector,
+				      enum drm_connector_status status,
+				      const u8 *dpcd,
+				      const u8 port_cap[4])

Inconsistent parameters.

Quoted 37 lines
drivers/gpu/drm/drm_dp_helper.c +11 -0
+{
+	enum drm_mode_subconnector subconnector = DRM_MODE_SUBCONNECTOR_Unknown;
+
+	if (status == connector_status_connected)
+		subconnector = drm_dp_subconnector_type(dpcd, port_cap);
+	drm_object_property_set_value(&connector->base,
+			connector->dev->mode_config.dp_subconnector_property,
+			subconnector);
+}
+EXPORT_SYMBOL(drm_dp_set_subconnector_property);
+
 /*
  * I2C-over-AUX implementation
  */
include/drm/drm_connector.h +3 -0
index fd543d1..82797c8 100644
@@ -1556,10 +1556,13 @@ const char *drm_get_dvi_i_subconnector_name(int val);
 const char *drm_get_dvi_i_select_name(int val);
 const char *drm_get_tv_subconnector_name(int val);
 const char *drm_get_tv_select_name(int val);
+const char *drm_get_dp_subconnector_name(int val);
 const char *drm_get_content_protection_name(int val);
 const char *drm_get_hdcp_content_type_name(int val);
 
 int drm_mode_create_dvi_i_properties(struct drm_device *dev);
+void drm_mode_add_dp_subconnector_property(struct drm_connector *connector);
+
 int drm_mode_create_tv_margin_properties(struct drm_device *dev);
 int drm_mode_create_tv_properties(struct drm_device *dev,
 				  unsigned int num_modes,
include/drm/drm_dp_helper.h +0 -0
index 305533d..6408b31 100644

include/drm/drm_dp_helper.h line 29

Quoted 4 lines
include/drm/drm_dp_helper.h +1 -0
@@ -26,6 +26,7 @@
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/types.h>
+#include <drm/drm_connector.h>

Forward declarations instead of includes if possible, please.

Quoted 4 lines
include/drm/drm_dp_helper.h +0 -0
 /*
  * Unless otherwise noted, all values are from the DP 1.1a spec.  Note that

include/drm/drm_dp_helper.h int drm_dp_downstream_max_bpc(const u8 dpcd[DP_RECEIVER_CAP_SIZE], · line 1609

Quoted 10 lines
include/drm/drm_dp_helper.h +7 -0
@@ -1599,6 +1600,13 @@ int drm_dp_downstream_max_bpc(const u8 dpcd[DP_RECEIVER_CAP_SIZE],
 int drm_dp_downstream_id(struct drm_dp_aux *aux, char id[6]);
 void drm_dp_downstream_debug(struct seq_file *m, const u8 dpcd[DP_RECEIVER_CAP_SIZE],
 			     const u8 port_cap[4], struct drm_dp_aux *aux);
+enum drm_mode_subconnector
+drm_dp_subconnector_type(const u8 dpcd[DP_RECEIVER_CAP_SIZE],
+			 const u8 port_cap[4]);
+void drm_dp_set_subconnector_property(struct drm_connector *connector,
+				      enum drm_connector_status status,
+				      const u8 *dpcd,
+				      const u8 port_cap[4]);

Inconsistent parameters.

Quoted 52 lines
include/drm/drm_dp_helper.h +0 -0
 void drm_dp_remote_aux_init(struct drm_dp_aux *aux);
 void drm_dp_aux_init(struct drm_dp_aux *aux);
include/drm/drm_mode_config.h +6 -0
index 6c3ef49..085fb00 100644
@@ -681,6 +681,12 @@ struct drm_mode_config {
 	struct drm_property *dvi_i_select_subconnector_property;
 
 	/**
+	 * @dp_subconnector_property: Optional DP property to differentiate
+	 * between different DP downstream port types.
+	 */
+	struct drm_property *dp_subconnector_property;
+
+	/**
 	 * @tv_subconnector_property: Optional TV property to differentiate
 	 * between different TV connector types.
 	 */
include/uapi/drm/drm_mode.h +13 -8
index 735c8cf..3358c6b 100644
@@ -332,14 +332,19 @@ struct drm_mode_get_encoder {
 /* This is for connectors with multiple signal types. */
 /* Try to match DRM_MODE_CONNECTOR_X as closely as possible. */
 enum drm_mode_subconnector {
-	DRM_MODE_SUBCONNECTOR_Automatic = 0,
-	DRM_MODE_SUBCONNECTOR_Unknown = 0,
-	DRM_MODE_SUBCONNECTOR_DVID = 3,
-	DRM_MODE_SUBCONNECTOR_DVIA = 4,
-	DRM_MODE_SUBCONNECTOR_Composite = 5,
-	DRM_MODE_SUBCONNECTOR_SVIDEO = 6,
-	DRM_MODE_SUBCONNECTOR_Component = 8,
-	DRM_MODE_SUBCONNECTOR_SCART = 9,
+	DRM_MODE_SUBCONNECTOR_Automatic   = 0,  /* DVI-I, TV     */
+	DRM_MODE_SUBCONNECTOR_Unknown     = 0,  /* DVI-I, TV, DP */
+	DRM_MODE_SUBCONNECTOR_VGA	  = 1,  /*            DP */
+	DRM_MODE_SUBCONNECTOR_DVID	  = 3,  /* DVI-I      DP */
+	DRM_MODE_SUBCONNECTOR_DVIA	  = 4,  /* DVI-I         */
+	DRM_MODE_SUBCONNECTOR_Composite   = 5,  /*        TV     */
+	DRM_MODE_SUBCONNECTOR_SVIDEO	  = 6,  /*        TV     */
+	DRM_MODE_SUBCONNECTOR_Component   = 8,  /*        TV     */
+	DRM_MODE_SUBCONNECTOR_SCART	  = 9,  /*        TV     */
+	DRM_MODE_SUBCONNECTOR_DisplayPort = 10, /*            DP */
+	DRM_MODE_SUBCONNECTOR_HDMIA       = 11, /*            DP */
+	DRM_MODE_SUBCONNECTOR_Native      = 15, /*            DP */
+	DRM_MODE_SUBCONNECTOR_Wireless    = 18, /*            DP */
 };
 
 #define DRM_MODE_CONNECTOR_Unknown	0
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
author
#15 lore raw
Quoted 124 lines · Jani Nikula
Quoted 28 lines · Jeevan B

From: Oleg Vasilev <[email protected]>

Currently, downstream port type is only reported in debugfs. This information should be considered important since it reflects the actual physical connector type. Some userspace (e.g. window compositors) may want to show this info to a user.

The 'subconnector' property is already utilized for DVI-I and TV-out for reporting connector subtype.

The initial motivation for this feature came from i2c test [1]. It is supposed to be skipped on VGA connectors, but it cannot detect VGA over DP and fails instead.

v2:
- Ville: utilized drm_dp_is_branch()
- Ville: implement DP 1.0 downstream type info
- Replaced create_dp_properties with add_dp_subconnector_property
- Added dp_set_subconnector_property helper

v4:
- Ville: add DP1.0 best assumption about subconnector
- Ville: assume DVI is DVI-D
- Ville: reuse Writeback enum value for Virtual subconnector
- Renamed #defines: HDMI -> HDMIA, DP -> DisplayPort

v5: rebase

Quoted 8 lines

[1]: https://bugs.freedesktop.org/show_bug.cgi?id=104097

High level looks fine to me, please see some nitpicks inline.

BR,
Jani.

Quoted 67 lines
---
 drivers/gpu/drm/drm_connector.c | 49 ++++++++++++++++++++++++--
 drivers/gpu/drm/drm_dp_helper.c | 77 +++++++++++++++++++++++++++++++++++++++++
 include/drm/drm_connector.h     |  3 ++
 include/drm/drm_dp_helper.h     |  8 +++++
 include/drm/drm_mode_config.h   |  6 ++++
 include/uapi/drm/drm_mode.h     | 21 ++++++-----
 6 files changed, 154 insertions(+), 10 deletions(-)
drivers/gpu/drm/drm_connector.c +23 -2
index b1099e1..b6972d1 100644
@@ -844,7 +844,7 @@ static const struct drm_prop_enum_list drm_dvi_i_select_enum_list[] = {
 DRM_ENUM_NAME_FN(drm_get_dvi_i_select_name, drm_dvi_i_select_enum_list)
 
 static const struct drm_prop_enum_list drm_dvi_i_subconnector_enum_list[] = {
-	{ DRM_MODE_SUBCONNECTOR_Unknown,   "Unknown"   }, /* DVI-I and TV-out */
+	{ DRM_MODE_SUBCONNECTOR_Unknown,   "Unknown"   }, /* DVI-I, TV-out and DP */
 	{ DRM_MODE_SUBCONNECTOR_DVID,      "DVI-D"     }, /* DVI-I  */
 	{ DRM_MODE_SUBCONNECTOR_DVIA,      "DVI-A"     }, /* DVI-I  */
 };
@@ -861,7 +861,7 @@ static const struct drm_prop_enum_list drm_tv_select_enum_list[] = {
 DRM_ENUM_NAME_FN(drm_get_tv_select_name, drm_tv_select_enum_list)
 
 static const struct drm_prop_enum_list drm_tv_subconnector_enum_list[] = {
-	{ DRM_MODE_SUBCONNECTOR_Unknown,   "Unknown"   }, /* DVI-I and TV-out */
+	{ DRM_MODE_SUBCONNECTOR_Unknown,   "Unknown"   }, /* DVI-I, TV-out and DP */
 	{ DRM_MODE_SUBCONNECTOR_Composite, "Composite" }, /* TV-out */
 	{ DRM_MODE_SUBCONNECTOR_SVIDEO,    "SVIDEO"    }, /* TV-out */
 	{ DRM_MODE_SUBCONNECTOR_Component, "Component" }, /* TV-out */
@@ -870,6 +870,19 @@ static const struct drm_prop_enum_list drm_tv_subconnector_enum_list[] = {
 DRM_ENUM_NAME_FN(drm_get_tv_subconnector_name,
 		 drm_tv_subconnector_enum_list)
 
+static const struct drm_prop_enum_list drm_dp_subconnector_enum_list[] = {
+	{ DRM_MODE_SUBCONNECTOR_Unknown,     "Unknown"   }, /* DVI-I, TV-out and DP */
+	{ DRM_MODE_SUBCONNECTOR_VGA,	     "VGA"       }, /* DP */
+	{ DRM_MODE_SUBCONNECTOR_DVID,	     "DVI-D"     }, /* DP */
+	{ DRM_MODE_SUBCONNECTOR_HDMIA,	     "HDMI"      }, /* DP */
+	{ DRM_MODE_SUBCONNECTOR_DisplayPort, "DP"        }, /* DP */
+	{ DRM_MODE_SUBCONNECTOR_Wireless,    "Wireless"  }, /* DP */
+	{ DRM_MODE_SUBCONNECTOR_Native,	     "Native"    }, /* DP */
+};
+
+DRM_ENUM_NAME_FN(drm_get_dp_subconnector_name,
+		 drm_dp_subconnector_enum_list)
+
 static const struct drm_prop_enum_list hdmi_colorspaces[] = {
 	/* For Default case, driver will set the colorspace */
 	{ DRM_MODE_COLORIMETRY_DEFAULT, "Default" },
@@ -1186,6 +1199,14 @@ static const struct drm_prop_enum_list dp_colorspaces[] = {
  *	can also expose this property to external outputs, in which case they
  *	must support "None", which should be the default (since external screens
  *	have a built-in scaler).
+ *
+ * subconnector:
+ *	This property is used by DVI-I, TVout and DisplayPort to indicate different
+ *	connector subtypes. Enum values more or less match with those from main
+ *	connector types.
+ *	For DVI-I and TVout there is also a matching property "select subconnector"
+ *	allowing to switch between signal types.
+ *	DP subconnector corresponds to a downstream port.
  */
 
 int drm_connector_create_standard_properties(struct drm_device *dev)

drivers/gpu/drm/drm_connector.c int drm_mode_create_dvi_i_properties(struct drm_device *dev) · line 1305

Quoted 10 lines
drivers/gpu/drm/drm_connector.c +7 -0
@@ -1275,6 +1296,30 @@ int drm_mode_create_dvi_i_properties(struct drm_device *dev)
 EXPORT_SYMBOL(drm_mode_create_dvi_i_properties);
 
 /**
+ * drm_mode_add_dp_subconnector_property - create subconnector property for DP
+ * @connector: drm_connector to attach property
+ *
+ * Called by a driver when DP connector is created.
+ */
+void drm_mode_add_dp_subconnector_property(struct drm_connector *connector)
+{

So far most functions dealing with properties are named:

Quoted 9 lines

- drm_mode_create_*
- drm_connector_attach_*

Sometimes the latter calling the former, sometimes creating inline.

drm_mode_add_* that attaches a property on a connector is confusing.

Perhaps call it drm_connector_attach_dp_subconnector_property().

Sure, I will change this.

Quoted 86 lines
Quoted 25 lines
drivers/gpu/drm/drm_connector.c +17 -0
+	struct drm_mode_config *mode_config = &connector->dev->mode_config;
+
+	if (!mode_config->dp_subconnector_property)
+		mode_config->dp_subconnector_property =
+			drm_property_create_enum(connector->dev,
+				DRM_MODE_PROP_IMMUTABLE,
+				"subconnector",
+				drm_dp_subconnector_enum_list,
+				ARRAY_SIZE(drm_dp_subconnector_enum_list));
+
+	drm_object_attach_property(&connector->base,
+				   mode_config->dp_subconnector_property,
+				   DRM_MODE_SUBCONNECTOR_Unknown);
+}
+EXPORT_SYMBOL(drm_mode_add_dp_subconnector_property);
+
+/**
  * DOC: HDMI connector properties
  *
  * content type (HDMI specific):
drivers/gpu/drm/drm_dp_helper.c +0 -0
index 8ba4531..5d5b50f 100644

drivers/gpu/drm/drm_dp_helper.c void drm_dp_downstream_debug(struct seq_file *m, · line 600

Quoted 7 lines
drivers/gpu/drm/drm_dp_helper.c +4 -0
@@ -594,6 +594,83 @@ void drm_dp_downstream_debug(struct seq_file *m,
 }
 EXPORT_SYMBOL(drm_dp_downstream_debug);
 
+/**
+ * drm_dp_subconnector_type() - get DP branch device type
+ * @dpcd: DisplayPort configuration data
+ * @port_cap: port capabilities

This does not help at all. What should this point at?

Quoted 51 lines
drivers/gpu/drm/drm_dp_helper.c +51 -0
+ *
+ */
+enum drm_mode_subconnector
+drm_dp_subconnector_type(const u8 dpcd[DP_RECEIVER_CAP_SIZE],
+			 const u8 port_cap[4])
+{
+	int type;
+	if (!drm_dp_is_branch(dpcd))
+		return DRM_MODE_SUBCONNECTOR_Native;
+	/* DP 1.0 approach */
+	if (dpcd[DP_DPCD_REV] == DP_DPCD_REV_10) {
+		type = dpcd[DP_DOWNSTREAMPORT_PRESENT] &
+		       DP_DWN_STRM_PORT_TYPE_MASK;
+
+		switch (type) {
+		case DP_DWN_STRM_PORT_TYPE_TMDS:
+			/* Can be HDMI or DVI-D, DVI-D is a safer option */
+			return DRM_MODE_SUBCONNECTOR_DVID;
+		case DP_DWN_STRM_PORT_TYPE_ANALOG:
+			/* Can be VGA or DVI-A, VGA is more popular */
+			return DRM_MODE_SUBCONNECTOR_VGA;
+		case DP_DWN_STRM_PORT_TYPE_DP:
+			return DRM_MODE_SUBCONNECTOR_DisplayPort;
+		case DP_DWN_STRM_PORT_TYPE_OTHER:
+		default:
+			return DRM_MODE_SUBCONNECTOR_Unknown;
+		}
+	}
+	type = port_cap[0] & DP_DS_PORT_TYPE_MASK;
+
+	switch (type) {
+	case DP_DS_PORT_TYPE_DP:
+	case DP_DS_PORT_TYPE_DP_DUALMODE:
+		return DRM_MODE_SUBCONNECTOR_DisplayPort;
+	case DP_DS_PORT_TYPE_VGA:
+		return DRM_MODE_SUBCONNECTOR_VGA;
+	case DP_DS_PORT_TYPE_DVI:
+		return DRM_MODE_SUBCONNECTOR_DVID;
+	case DP_DS_PORT_TYPE_HDMI:
+		return DRM_MODE_SUBCONNECTOR_HDMIA;
+	case DP_DS_PORT_TYPE_WIRELESS:
+		return DRM_MODE_SUBCONNECTOR_Wireless;
+	case DP_DS_PORT_TYPE_NON_EDID:
+	default:
+		return DRM_MODE_SUBCONNECTOR_Unknown;
+	}
+}
+EXPORT_SYMBOL(drm_dp_subconnector_type);
+
+/**
+ * drm_mode_set_dp_subconnector_property - set subconnector for DP connector
Quoted 9 lines

drivers/gpu/drm/drm_dp_helper.c void drm_dp_downstream_debug(struct seq_file *m, · line 655

Quoted 4 lines
drivers/gpu/drm/drm_dp_helper.c +4 -0
+ * @connector: dp connector to attach property
+ * @status: connector status which is about to be set
+ * @dpcd: DisplayPort configuration data
+ * @port_cap: port capabilities

Unhelpful documentation. Sure port_cap is port capabilities, but what should this point at? (I can tell looking at the code, but what's the point of documentation if you have to look at the code?)

I will correct this.
Oleg might have added this just like in other functions as below /**
* drm_dp_downstream_debug() - debug DP branch devices
* @m: pointer for debugfs file
* @dpcd: DisplayPort configuration data
* @port_cap: port capabilities
* @aux: DisplayPort AUX channel
*
*/

Quoted 45 lines

drivers/gpu/drm/drm_dp_helper.c void drm_dp_downstream_debug(struct seq_file *m, · line 662

Quoted 7 lines
drivers/gpu/drm/drm_dp_helper.c +7 -0
+ *
+ * Called by a driver on every detect event.
+ */
+void drm_dp_set_subconnector_property(struct drm_connector *connector,
+				      enum drm_connector_status status,
+				      const u8 *dpcd,
+				      const u8 port_cap[4])

Inconsistent parameters.

Quoted 35 lines
drivers/gpu/drm/drm_dp_helper.c +11 -0
+{
+	enum drm_mode_subconnector subconnector = DRM_MODE_SUBCONNECTOR_Unknown;
+
+	if (status == connector_status_connected)
+		subconnector = drm_dp_subconnector_type(dpcd, port_cap);
+	drm_object_property_set_value(&connector->base,
+			connector->dev->mode_config.dp_subconnector_property,
+			subconnector);
+}
+EXPORT_SYMBOL(drm_dp_set_subconnector_property);
+
 /*
  * I2C-over-AUX implementation
  */
include/drm/drm_connector.h +3 -0
index fd543d1..82797c8 100644
@@ -1556,10 +1556,13 @@ const char *drm_get_dvi_i_subconnector_name(int val);
 const char *drm_get_dvi_i_select_name(int val);
 const char *drm_get_tv_subconnector_name(int val);
 const char *drm_get_tv_select_name(int val);
+const char *drm_get_dp_subconnector_name(int val);
 const char *drm_get_content_protection_name(int val);
 const char *drm_get_hdcp_content_type_name(int val);
 
 int drm_mode_create_dvi_i_properties(struct drm_device *dev);
+void drm_mode_add_dp_subconnector_property(struct drm_connector *connector);
+
 int drm_mode_create_tv_margin_properties(struct drm_device *dev);
 int drm_mode_create_tv_properties(struct drm_device *dev,
 				  unsigned int num_modes,
include/drm/drm_dp_helper.h +0 -1
index 305533d..6408b31 100644
--- a/include/drm/drm_dp_helper.h
Quoted 9 lines

include/drm/drm_dp_helper.h line 29

Quoted 6 lines

+++ b/include/drm/drm_dp_helper.h

include/drm/drm_dp_helper.h +1 -0
@@ -26,6 +26,7 @@
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/types.h>
+#include <drm/drm_connector.h>

Forward declarations instead of includes if possible, please.

I will change it.

Quoted 68 lines
Quoted 4 lines
include/drm/drm_dp_helper.h +0 -0
 /*
  * Unless otherwise noted, all values are from the DP 1.1a spec.  Note that

include/drm/drm_dp_helper.h int drm_dp_downstream_max_bpc(const u8 dpcd[DP_RECEIVER_CAP_SIZE], · line 1609

Quoted 10 lines
include/drm/drm_dp_helper.h +7 -0
@@ -1599,6 +1600,13 @@ int drm_dp_downstream_max_bpc(const u8 dpcd[DP_RECEIVER_CAP_SIZE],
 int drm_dp_downstream_id(struct drm_dp_aux *aux, char id[6]);
 void drm_dp_downstream_debug(struct seq_file *m, const u8 dpcd[DP_RECEIVER_CAP_SIZE],
 			     const u8 port_cap[4], struct drm_dp_aux *aux);
+enum drm_mode_subconnector
+drm_dp_subconnector_type(const u8 dpcd[DP_RECEIVER_CAP_SIZE],
+			 const u8 port_cap[4]);
+void drm_dp_set_subconnector_property(struct drm_connector *connector,
+				      enum drm_connector_status status,
+				      const u8 *dpcd,
+				      const u8 port_cap[4]);

Inconsistent parameters.

Quoted 51 lines
include/drm/drm_dp_helper.h +0 -0
 void drm_dp_remote_aux_init(struct drm_dp_aux *aux);
 void drm_dp_aux_init(struct drm_dp_aux *aux);
include/drm/drm_mode_config.h +6 -0
index 6c3ef49..085fb00 100644
@@ -681,6 +681,12 @@ struct drm_mode_config {
 	struct drm_property *dvi_i_select_subconnector_property;
 
 	/**
+	 * @dp_subconnector_property: Optional DP property to differentiate
+	 * between different DP downstream port types.
+	 */
+	struct drm_property *dp_subconnector_property;
+
+	/**
 	 * @tv_subconnector_property: Optional TV property to differentiate
 	 * between different TV connector types.
 	 */
include/uapi/drm/drm_mode.h +13 -8
index 735c8cf..3358c6b 100644
@@ -332,14 +332,19 @@ struct drm_mode_get_encoder {
 /* This is for connectors with multiple signal types. */
 /* Try to match DRM_MODE_CONNECTOR_X as closely as possible. */
 enum drm_mode_subconnector {
-	DRM_MODE_SUBCONNECTOR_Automatic = 0,
-	DRM_MODE_SUBCONNECTOR_Unknown = 0,
-	DRM_MODE_SUBCONNECTOR_DVID = 3,
-	DRM_MODE_SUBCONNECTOR_DVIA = 4,
-	DRM_MODE_SUBCONNECTOR_Composite = 5,
-	DRM_MODE_SUBCONNECTOR_SVIDEO = 6,
-	DRM_MODE_SUBCONNECTOR_Component = 8,
-	DRM_MODE_SUBCONNECTOR_SCART = 9,
+	DRM_MODE_SUBCONNECTOR_Automatic   = 0,  /* DVI-I, TV     */
+	DRM_MODE_SUBCONNECTOR_Unknown     = 0,  /* DVI-I, TV, DP */
+	DRM_MODE_SUBCONNECTOR_VGA	  = 1,  /*            DP */
+	DRM_MODE_SUBCONNECTOR_DVID	  = 3,  /* DVI-I      DP */
+	DRM_MODE_SUBCONNECTOR_DVIA	  = 4,  /* DVI-I         */
+	DRM_MODE_SUBCONNECTOR_Composite   = 5,  /*        TV     */
+	DRM_MODE_SUBCONNECTOR_SVIDEO	  = 6,  /*        TV     */
+	DRM_MODE_SUBCONNECTOR_Component   = 8,  /*        TV     */
+	DRM_MODE_SUBCONNECTOR_SCART	  = 9,  /*        TV     */
+	DRM_MODE_SUBCONNECTOR_DisplayPort = 10, /*            DP */
+	DRM_MODE_SUBCONNECTOR_HDMIA       = 11, /*            DP */
+	DRM_MODE_SUBCONNECTOR_Native      = 15, /*            DP */
+	DRM_MODE_SUBCONNECTOR_Wireless    = 18, /*            DP */
 };
 
Quoted 4 lines
Quoted 1 line
include/uapi/drm/drm_mode.h +0 -0
 #define DRM_MODE_CONNECTOR_Unknown	0
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel