[PATCH 0/7] Small fixes before fixing MST

[PATCH 0/7] Small fixes before fixing MST

[Lucas De Marchi]

I'm trying to understand why TGL is failing on link training when MST is
enabled. I couldn't find it yet, but here some trivial patches trying to
improve our code.

Lucas De Marchi (7):
  drm/i915: simplify setting of ddi_io_power_domain
  drm/i915: cleanup unused returns on DP-MST
  drm/i915: fix port checks for MST support on gen >= 11
  drm/i915: remove extra new line on pipe_config mismatch
  drm/i915: add pipe name to pipe mismatch logs
  drm/i915: prettify MST debug message
  drm/dp-mst: fix warning on unused var

 drivers/gpu/drm/drm_dp_mst_topology.c        |  2 -
 drivers/gpu/drm/i915/display/intel_ddi.c     | 43 ++-------------
 drivers/gpu/drm/i915/display/intel_display.c | 55 +++++++++++---------
 drivers/gpu/drm/i915/display/intel_dp.c      |  9 ++--
 drivers/gpu/drm/i915/display/intel_dp_mst.c  | 26 ++++++---
 drivers/gpu/drm/i915/display/intel_dp_mst.h  |  2 +-
 6 files changed, 54 insertions(+), 83 deletions(-)

-- 
2.23.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH 1/7] drm/i915: simplify setting of ddi_io_power_domain

[Lucas De Marchi]

Instead of the ever growing switch, just compute the ddi io power domain
based on the port number.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
 drivers/gpu/drm/i915/display/intel_ddi.c | 43 ++----------------------
 1 file changed, 3 insertions(+), 40 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index 6c1315c7bcde..b2776f6044ae 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -4750,46 +4750,9 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
 		intel_encoder->update_complete = intel_ddi_update_complete;
 	}
 
-	switch (port) {
-	case PORT_A:
-		intel_dig_port->ddi_io_power_domain =
-			POWER_DOMAIN_PORT_DDI_A_IO;
-		break;
-	case PORT_B:
-		intel_dig_port->ddi_io_power_domain =
-			POWER_DOMAIN_PORT_DDI_B_IO;
-		break;
-	case PORT_C:
-		intel_dig_port->ddi_io_power_domain =
-			POWER_DOMAIN_PORT_DDI_C_IO;
-		break;
-	case PORT_D:
-		intel_dig_port->ddi_io_power_domain =
-			POWER_DOMAIN_PORT_DDI_D_IO;
-		break;
-	case PORT_E:
-		intel_dig_port->ddi_io_power_domain =
-			POWER_DOMAIN_PORT_DDI_E_IO;
-		break;
-	case PORT_F:
-		intel_dig_port->ddi_io_power_domain =
-			POWER_DOMAIN_PORT_DDI_F_IO;
-		break;
-	case PORT_G:
-		intel_dig_port->ddi_io_power_domain =
-			POWER_DOMAIN_PORT_DDI_G_IO;
-		break;
-	case PORT_H:
-		intel_dig_port->ddi_io_power_domain =
-			POWER_DOMAIN_PORT_DDI_H_IO;
-		break;
-	case PORT_I:
-		intel_dig_port->ddi_io_power_domain =
-			POWER_DOMAIN_PORT_DDI_I_IO;
-		break;
-	default:
-		MISSING_CASE(port);
-	}
+	WARN_ON(port > PORT_I);
+	intel_dig_port->ddi_io_power_domain = POWER_DOMAIN_PORT_DDI_A_IO +
+					      port - PORT_A;
 
 	if (init_dp) {
 		if (!intel_ddi_init_dp_connector(intel_dig_port))
-- 
2.23.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH 2/7] drm/i915: cleanup unused returns on DP-MST

[Lucas De Marchi]

Those init functions mark their success in the intel_dig_port
struct, the return values are not really used.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
 drivers/gpu/drm/i915/display/intel_dp_mst.c | 11 +++++------
 drivers/gpu/drm/i915/display/intel_dp_mst.h |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index 2203be28ea01..c2bbba1effc1 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -634,7 +634,7 @@ intel_dp_create_fake_mst_encoder(struct intel_digital_port *intel_dig_port, enum
 
 }
 
-static bool
+static void
 intel_dp_create_fake_mst_encoders(struct intel_digital_port *intel_dig_port)
 {
 	struct intel_dp *intel_dp = &intel_dig_port->dp;
@@ -643,7 +643,6 @@ intel_dp_create_fake_mst_encoders(struct intel_digital_port *intel_dig_port)
 
 	for_each_pipe(dev_priv, pipe)
 		intel_dp->mst_encoders[pipe] = intel_dp_create_fake_mst_encoder(intel_dig_port, pipe);
-	return true;
 }
 
 int
@@ -652,14 +651,13 @@ intel_dp_mst_encoder_active_links(struct intel_digital_port *intel_dig_port)
 	return intel_dig_port->dp.active_mst_links;
 }
 
-int
+void
 intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_base_id)
 {
 	struct intel_dp *intel_dp = &intel_dig_port->dp;
 	struct drm_device *dev = intel_dig_port->base.base.dev;
 	int ret;
 
-	intel_dp->can_mst = true;
 	intel_dp->mst_mgr.cbs = &mst_cbs;
 
 	/* create encoders */
@@ -668,9 +666,10 @@ intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_ba
 					   &intel_dp->aux, 16, 3, conn_base_id);
 	if (ret) {
 		intel_dp->can_mst = false;
-		return ret;
+		return;
 	}
-	return 0;
+
+	intel_dp->can_mst = true;
 }
 
 void
diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.h b/drivers/gpu/drm/i915/display/intel_dp_mst.h
index f660ad80db04..f2478c17a8fd 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.h
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.h
@@ -8,7 +8,7 @@
 
 struct intel_digital_port;
 
-int intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_id);
+void intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_id);
 void intel_dp_mst_encoder_cleanup(struct intel_digital_port *intel_dig_port);
 int intel_dp_mst_encoder_active_links(struct intel_digital_port *intel_dig_port);
 
-- 
2.23.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH 3/7] drm/i915: fix port checks for MST support on gen >= 11

[Lucas De Marchi]

Both Ice Lake and Elkhart Lake (gen 11) support MST on all external
connections except DDI A. Tiger Lake (gen 12) supports on all external
connections.

Move the check to happen inside intel_dp_mst_encoder_init() and add
specific platform checks.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
 drivers/gpu/drm/i915/display/intel_dp.c     |  7 ++-----
 drivers/gpu/drm/i915/display/intel_dp_mst.c | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 0e45c61d7331..348a09890611 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -7268,11 +7268,8 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
 		intel_connector->get_hw_state = intel_connector_get_hw_state;
 
 	/* init MST on ports that can support it */
-	if (HAS_DP_MST(dev_priv) && !intel_dp_is_edp(intel_dp) &&
-	    (port == PORT_B || port == PORT_C ||
-	     port == PORT_D || port == PORT_F))
-		intel_dp_mst_encoder_init(intel_dig_port,
-					  intel_connector->base.base.id);
+	intel_dp_mst_encoder_init(intel_dig_port,
+				  intel_connector->base.base.id);
 
 	if (!intel_edp_init_connector(intel_dp, intel_connector)) {
 		intel_dp_aux_fini(intel_dp);
diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index c2bbba1effc1..8dcb578e6d01 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -654,15 +654,26 @@ intel_dp_mst_encoder_active_links(struct intel_digital_port *intel_dig_port)
 void
 intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_base_id)
 {
+	struct drm_i915_private *i915 = to_i915(intel_dig_port->base.base.dev);
 	struct intel_dp *intel_dp = &intel_dig_port->dp;
-	struct drm_device *dev = intel_dig_port->base.base.dev;
+	enum port port = intel_dig_port->base.port;
 	int ret;
 
+	if (!HAS_DP_MST(i915) || intel_dp_is_edp(intel_dp))
+		return;
+
+	if (INTEL_GEN(i915) == 11 && port == PORT_A)
+		return;
+
+	if (INTEL_GEN(i915) < 11 &&
+	    port != PORT_B && port != PORT_C && port != PORT_D && port != PORT_F)
+		return;
+
 	intel_dp->mst_mgr.cbs = &mst_cbs;
 
 	/* create encoders */
 	intel_dp_create_fake_mst_encoders(intel_dig_port);
-	ret = drm_dp_mst_topology_mgr_init(&intel_dp->mst_mgr, dev,
+	ret = drm_dp_mst_topology_mgr_init(&intel_dp->mst_mgr, &i915->drm,
 					   &intel_dp->aux, 16, 3, conn_base_id);
 	if (ret) {
 		intel_dp->can_mst = false;
-- 
2.23.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH 4/7] drm/i915: remove extra new line on pipe_config mismatch

[Lucas De Marchi]

The new line is already added by pipe_config_mismatch(), so the callers
shouldn't add it.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 22 ++++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index a146ec02a0c1..c5985f0b5bbf 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -12581,7 +12581,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
 #define PIPE_CONF_CHECK_X(name) do { \
 	if (current_config->name != pipe_config->name) { \
 		pipe_config_mismatch(fastset, __stringify(name), \
-				     "(expected 0x%08x, found 0x%08x)\n", \
+				     "(expected 0x%08x, found 0x%08x)", \
 				     current_config->name, \
 				     pipe_config->name); \
 		ret = false; \
@@ -12591,7 +12591,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
 #define PIPE_CONF_CHECK_I(name) do { \
 	if (current_config->name != pipe_config->name) { \
 		pipe_config_mismatch(fastset, __stringify(name), \
-				     "(expected %i, found %i)\n", \
+				     "(expected %i, found %i)", \
 				     current_config->name, \
 				     pipe_config->name); \
 		ret = false; \
@@ -12601,7 +12601,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
 #define PIPE_CONF_CHECK_BOOL(name) do { \
 	if (current_config->name != pipe_config->name) { \
 		pipe_config_mismatch(fastset, __stringify(name), \
-				     "(expected %s, found %s)\n", \
+				     "(expected %s, found %s)", \
 				     yesno(current_config->name), \
 				     yesno(pipe_config->name)); \
 		ret = false; \
@@ -12618,7 +12618,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
 		PIPE_CONF_CHECK_BOOL(name); \
 	} else { \
 		pipe_config_mismatch(fastset, __stringify(name), \
-				     "unable to verify whether state matches exactly, forcing modeset (expected %s, found %s)\n", \
+				     "unable to verify whether state matches exactly, forcing modeset (expected %s, found %s)", \
 				     yesno(current_config->name), \
 				     yesno(pipe_config->name)); \
 		ret = false; \
@@ -12628,7 +12628,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
 #define PIPE_CONF_CHECK_P(name) do { \
 	if (current_config->name != pipe_config->name) { \
 		pipe_config_mismatch(fastset, __stringify(name), \
-				     "(expected %p, found %p)\n", \
+				     "(expected %p, found %p)", \
 				     current_config->name, \
 				     pipe_config->name); \
 		ret = false; \
@@ -12641,7 +12641,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
 				    !fastset)) { \
 		pipe_config_mismatch(fastset, __stringify(name), \
 				     "(expected tu %i gmch %i/%i link %i/%i, " \
-				     "found tu %i, gmch %i/%i link %i/%i)\n", \
+				     "found tu %i, gmch %i/%i link %i/%i)", \
 				     current_config->name.tu, \
 				     current_config->name.gmch_m, \
 				     current_config->name.gmch_n, \
@@ -12669,7 +12669,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
 		pipe_config_mismatch(fastset, __stringify(name), \
 				     "(expected tu %i gmch %i/%i link %i/%i, " \
 				     "or tu %i gmch %i/%i link %i/%i, " \
-				     "found tu %i, gmch %i/%i link %i/%i)\n", \
+				     "found tu %i, gmch %i/%i link %i/%i)", \
 				     current_config->name.tu, \
 				     current_config->name.gmch_m, \
 				     current_config->name.gmch_n, \
@@ -12692,7 +12692,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
 #define PIPE_CONF_CHECK_FLAGS(name, mask) do { \
 	if ((current_config->name ^ pipe_config->name) & (mask)) { \
 		pipe_config_mismatch(fastset, __stringify(name), \
-				     "(%x) (expected %i, found %i)\n", \
+				     "(%x) (expected %i, found %i)", \
 				     (mask), \
 				     current_config->name & (mask), \
 				     pipe_config->name & (mask)); \
@@ -12703,7 +12703,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
 #define PIPE_CONF_CHECK_CLOCK_FUZZY(name) do { \
 	if (!intel_fuzzy_clock_check(current_config->name, pipe_config->name)) { \
 		pipe_config_mismatch(fastset, __stringify(name), \
-				     "(expected %i, found %i)\n", \
+				     "(expected %i, found %i)", \
 				     current_config->name, \
 				     pipe_config->name); \
 		ret = false; \
@@ -12723,7 +12723,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
 #define PIPE_CONF_CHECK_COLOR_LUT(name1, name2, bit_precision) do { \
 	if (current_config->name1 != pipe_config->name1) { \
 		pipe_config_mismatch(fastset, __stringify(name1), \
-				"(expected %i, found %i, won't compare lut values)\n", \
+				"(expected %i, found %i, won't compare lut values)", \
 				current_config->name1, \
 				pipe_config->name1); \
 		ret = false;\
@@ -12732,7 +12732,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
 					pipe_config->name2, pipe_config->name1, \
 					bit_precision)) { \
 			pipe_config_mismatch(fastset, __stringify(name2), \
-					"hw_state doesn't match sw_state\n"); \
+					"hw_state doesn't match sw_state"); \
 			ret = false; \
 		} \
 	} \
-- 
2.23.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH 5/7] drm/i915: add pipe name to pipe mismatch logs

[Lucas De Marchi]

This way it's easier to figure out what didn't match when we have
multiple pipes enabled.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 33 +++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index c5985f0b5bbf..fbc1f01f70d8 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -12526,8 +12526,9 @@ pipe_config_infoframe_mismatch(struct drm_i915_private *dev_priv,
 	}
 }
 
-static void __printf(3, 4)
-pipe_config_mismatch(bool fastset, const char *name, const char *format, ...)
+static void __printf(4, 5)
+pipe_config_mismatch(bool fastset, const char *crtc_name, const char *name,
+		     const char *format, ...)
 {
 	struct va_format vaf;
 	va_list args;
@@ -12537,9 +12538,10 @@ pipe_config_mismatch(bool fastset, const char *name, const char *format, ...)
 	vaf.va = &args;
 
 	if (fastset)
-		DRM_DEBUG_KMS("fastset mismatch in %s %pV\n", name, &vaf);
+		DRM_DEBUG_KMS("[%s] fastset mismatch in %s %pV\n",
+			      crtc_name, name, &vaf);
 	else
-		DRM_ERROR("mismatch in %s %pV\n", name, &vaf);
+		DRM_ERROR("[%s] mismatch in %s %pV\n", crtc_name, name, &vaf);
 
 	va_end(args);
 }
@@ -12567,6 +12569,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
 			  bool fastset)
 {
 	struct drm_i915_private *dev_priv = to_i915(current_config->base.crtc->dev);
+	const char *crtc_name = pipe_config->base.crtc->name;
 	bool ret = true;
 	u32 bp_gamma = 0;
 	bool fixup_inherited = fastset &&
@@ -12580,7 +12583,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
 
 #define PIPE_CONF_CHECK_X(name) do { \
 	if (current_config->name != pipe_config->name) { \
-		pipe_config_mismatch(fastset, __stringify(name), \
+		pipe_config_mismatch(fastset, crtc_name, __stringify(name), \
 				     "(expected 0x%08x, found 0x%08x)", \
 				     current_config->name, \
 				     pipe_config->name); \
@@ -12590,7 +12593,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
 
 #define PIPE_CONF_CHECK_I(name) do { \
 	if (current_config->name != pipe_config->name) { \
-		pipe_config_mismatch(fastset, __stringify(name), \
+		pipe_config_mismatch(fastset, crtc_name, __stringify(name), \
 				     "(expected %i, found %i)", \
 				     current_config->name, \
 				     pipe_config->name); \
@@ -12600,7 +12603,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
 
 #define PIPE_CONF_CHECK_BOOL(name) do { \
 	if (current_config->name != pipe_config->name) { \
-		pipe_config_mismatch(fastset, __stringify(name), \
+		pipe_config_mismatch(fastset, crtc_name,  __stringify(name), \
 				     "(expected %s, found %s)", \
 				     yesno(current_config->name), \
 				     yesno(pipe_config->name)); \
@@ -12617,7 +12620,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
 	if (!fixup_inherited || (!current_config->name && !pipe_config->name)) { \
 		PIPE_CONF_CHECK_BOOL(name); \
 	} else { \
-		pipe_config_mismatch(fastset, __stringify(name), \
+		pipe_config_mismatch(fastset, crtc_name, __stringify(name), \
 				     "unable to verify whether state matches exactly, forcing modeset (expected %s, found %s)", \
 				     yesno(current_config->name), \
 				     yesno(pipe_config->name)); \
@@ -12627,7 +12630,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
 
 #define PIPE_CONF_CHECK_P(name) do { \
 	if (current_config->name != pipe_config->name) { \
-		pipe_config_mismatch(fastset, __stringify(name), \
+		pipe_config_mismatch(fastset, crtc_name, __stringify(name), \
 				     "(expected %p, found %p)", \
 				     current_config->name, \
 				     pipe_config->name); \
@@ -12639,7 +12642,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
 	if (!intel_compare_link_m_n(&current_config->name, \
 				    &pipe_config->name,\
 				    !fastset)) { \
-		pipe_config_mismatch(fastset, __stringify(name), \
+		pipe_config_mismatch(fastset, crtc_name, __stringify(name), \
 				     "(expected tu %i gmch %i/%i link %i/%i, " \
 				     "found tu %i, gmch %i/%i link %i/%i)", \
 				     current_config->name.tu, \
@@ -12666,7 +12669,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
 				    &pipe_config->name, !fastset) && \
 	    !intel_compare_link_m_n(&current_config->alt_name, \
 				    &pipe_config->name, !fastset)) { \
-		pipe_config_mismatch(fastset, __stringify(name), \
+		pipe_config_mismatch(fastset, crtc_name, __stringify(name), \
 				     "(expected tu %i gmch %i/%i link %i/%i, " \
 				     "or tu %i gmch %i/%i link %i/%i, " \
 				     "found tu %i, gmch %i/%i link %i/%i)", \
@@ -12691,7 +12694,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
 
 #define PIPE_CONF_CHECK_FLAGS(name, mask) do { \
 	if ((current_config->name ^ pipe_config->name) & (mask)) { \
-		pipe_config_mismatch(fastset, __stringify(name), \
+		pipe_config_mismatch(fastset, crtc_name, __stringify(name), \
 				     "(%x) (expected %i, found %i)", \
 				     (mask), \
 				     current_config->name & (mask), \
@@ -12702,7 +12705,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
 
 #define PIPE_CONF_CHECK_CLOCK_FUZZY(name) do { \
 	if (!intel_fuzzy_clock_check(current_config->name, pipe_config->name)) { \
-		pipe_config_mismatch(fastset, __stringify(name), \
+		pipe_config_mismatch(fastset, crtc_name, __stringify(name), \
 				     "(expected %i, found %i)", \
 				     current_config->name, \
 				     pipe_config->name); \
@@ -12722,7 +12725,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
 
 #define PIPE_CONF_CHECK_COLOR_LUT(name1, name2, bit_precision) do { \
 	if (current_config->name1 != pipe_config->name1) { \
-		pipe_config_mismatch(fastset, __stringify(name1), \
+		pipe_config_mismatch(fastset, crtc_name, __stringify(name1), \
 				"(expected %i, found %i, won't compare lut values)", \
 				current_config->name1, \
 				pipe_config->name1); \
@@ -12731,7 +12734,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
 		if (!intel_color_lut_equal(current_config->name2, \
 					pipe_config->name2, pipe_config->name1, \
 					bit_precision)) { \
-			pipe_config_mismatch(fastset, __stringify(name2), \
+			pipe_config_mismatch(fastset, crtc_name, __stringify(name2), \
 					"hw_state doesn't match sw_state"); \
 			ret = false; \
 		} \
-- 
2.23.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH 6/7] drm/i915: prettify MST debug message

[Lucas De Marchi]

s/?/:/ so it's get correctly colored by dmesg.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
 drivers/gpu/drm/i915/display/intel_dp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 348a09890611..33a55da89ce9 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -4450,7 +4450,7 @@ intel_dp_configure_mst(struct intel_dp *intel_dp)
 		&dp_to_dig_port(intel_dp)->base;
 	bool sink_can_mst = intel_dp_sink_can_mst(intel_dp);
 
-	DRM_DEBUG_KMS("[ENCODER:%d:%s] MST support? port: %s, sink: %s, modparam: %s\n",
+	DRM_DEBUG_KMS("[ENCODER:%d:%s] MST support: port: %s, sink: %s, modparam: %s\n",
 		      encoder->base.base.id, encoder->base.name,
 		      yesno(intel_dp->can_mst), yesno(sink_can_mst),
 		      yesno(i915_modparams.enable_dp_mst));
-- 
2.23.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH 7/7] drm/dp-mst: fix warning on unused var

[Lucas De Marchi]

Fixes: 83fa9842afe7 ("drm/dp-mst: Drop connection_mutex check")
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
 drivers/gpu/drm/drm_dp_mst_topology.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index 9364e4f42975..9cccc5e63309 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -4184,8 +4184,6 @@ EXPORT_SYMBOL(drm_dp_mst_topology_state_funcs);
 struct drm_dp_mst_topology_state *drm_atomic_get_mst_topology_state(struct drm_atomic_state *state,
 								    struct drm_dp_mst_topology_mgr *mgr)
 {
-	struct drm_device *dev = mgr->dev;
-
 	return to_dp_mst_topology_state(drm_atomic_get_private_obj_state(state, &mgr->base));
 }
 EXPORT_SYMBOL(drm_atomic_get_mst_topology_state);
-- 
2.23.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.CHECKPATCH: warning for Small fixes before fixing MST

[Patchwork]

== Series Details ==

Series: Small fixes before fixing MST
URL   : https://patchwork.freedesktop.org/series/67883/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
0fdcd1fc0932 drm/i915: simplify setting of ddi_io_power_domain
e302891b93c2 drm/i915: cleanup unused returns on DP-MST
dca3b8dcfc48 drm/i915: fix port checks for MST support on gen >= 11
012957d242b9 drm/i915: remove extra new line on pipe_config mismatch
-:47: WARNING:LONG_LINE: line over 100 characters
#47: FILE: drivers/gpu/drm/i915/display/intel_display.c:12621:
+				     "unable to verify whether state matches exactly, forcing modeset (expected %s, found %s)", \

total: 0 errors, 1 warnings, 0 checks, 88 lines checked
9be0f0c1ce7e drm/i915: add pipe name to pipe mismatch logs
a126f0ea7641 drm/i915: prettify MST debug message
8ff3e4c04eee drm/dp-mst: fix warning on unused var

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.SPARSE: warning for Small fixes before fixing MST

[Patchwork]

== Series Details ==

Series: Small fixes before fixing MST
URL   : https://patchwork.freedesktop.org/series/67883/
State : warning

== Summary ==

$ dim sparse origin/drm-tip
Sparse version: v0.6.0
Commit: drm/i915: simplify setting of ddi_io_power_domain
Okay!

Commit: drm/i915: cleanup unused returns on DP-MST
Okay!

Commit: drm/i915: fix port checks for MST support on gen >= 11
Okay!

Commit: drm/i915: remove extra new line on pipe_config mismatch
Okay!

Commit: drm/i915: add pipe name to pipe mismatch logs
Okay!

Commit: drm/i915: prettify MST debug message
Okay!

Commit: drm/dp-mst: fix warning on unused var
-                     ^~~
-drivers/gpu/drm/drm_dp_mst_topology.c: In function ‘drm_atomic_get_mst_topology_state’:
-O:drivers/gpu/drm/drm_dp_mst_topology.c:4187:21: warning: unused variable ‘dev’ [-Wunused-variable]
-  struct drm_device *dev = mgr->dev;
+

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.BAT: success for Small fixes before fixing MST

[Patchwork]

== Series Details ==

Series: Small fixes before fixing MST
URL   : https://patchwork.freedesktop.org/series/67883/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_7060 -> Patchwork_14763
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

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

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

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

### IGT changes ###

#### Issues hit ####

  * igt@gem_ctx_switch@legacy-render:
    - fi-bxt-dsi:         [PASS][1] -> [INCOMPLETE][2] ([fdo#103927] / [fdo#111381])
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/fi-bxt-dsi/igt@gem_ctx_switch@legacy-render.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/fi-bxt-dsi/igt@gem_ctx_switch@legacy-render.html

  * igt@gem_workarounds@basic-read:
    - fi-icl-u3:          [PASS][3] -> [DMESG-WARN][4] ([fdo#107724])
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/fi-icl-u3/igt@gem_workarounds@basic-read.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/fi-icl-u3/igt@gem_workarounds@basic-read.html

  * igt@kms_chamelium@hdmi-hpd-fast:
    - fi-kbl-7500u:       [PASS][5] -> [FAIL][6] ([fdo#111407])
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html

  
#### Possible fixes ####

  * igt@gem_exec_suspend@basic-s3:
    - {fi-cml-s}:         [DMESG-WARN][7] ([fdo#111764]) -> [PASS][8]
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/fi-cml-s/igt@gem_exec_suspend@basic-s3.html
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/fi-cml-s/igt@gem_exec_suspend@basic-s3.html

  * igt@gem_mmap_gtt@basic:
    - fi-icl-u3:          [DMESG-WARN][9] ([fdo#107724]) -> [PASS][10] +1 similar issue
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/fi-icl-u3/igt@gem_mmap_gtt@basic.html
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/fi-icl-u3/igt@gem_mmap_gtt@basic.html

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

  [fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
  [fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
  [fdo#111381]: https://bugs.freedesktop.org/show_bug.cgi?id=111381
  [fdo#111407]: https://bugs.freedesktop.org/show_bug.cgi?id=111407
  [fdo#111764]: https://bugs.freedesktop.org/show_bug.cgi?id=111764


Participating hosts (53 -> 44)
------------------------------

  Additional (1): fi-tgl-u2 
  Missing    (10): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-bsw-n3050 fi-byt-squawks fi-bsw-cyan fi-kbl-x1275 fi-icl-y fi-byt-clapper fi-bdw-samus 


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

  * CI: CI-20190529 -> None
  * Linux: CI_DRM_7060 -> Patchwork_14763

  CI-20190529: 20190529
  CI_DRM_7060: bac86c35889cffa19d3f7368904c542edde4fafc @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_5220: 1e38e32d721210a780198c8293a6b8c8e881df68 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_14763: 8ff3e4c04eeecc2f17d6d7ac8836487f8252db17 @ git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

8ff3e4c04eee drm/dp-mst: fix warning on unused var
a126f0ea7641 drm/i915: prettify MST debug message
9be0f0c1ce7e drm/i915: add pipe name to pipe mismatch logs
012957d242b9 drm/i915: remove extra new line on pipe_config mismatch
dca3b8dcfc48 drm/i915: fix port checks for MST support on gen >= 11
e302891b93c2 drm/i915: cleanup unused returns on DP-MST
0fdcd1fc0932 drm/i915: simplify setting of ddi_io_power_domain

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH 2/7] drm/i915: cleanup unused returns on DP-MST

[Ville Syrjälä]

On Thu, Oct 10, 2019 at 06:09:02PM -0700, Lucas De Marchi wrote:
> Those init functions mark their success in the intel_dig_port
> struct, the return values are not really used.
> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_dp_mst.c | 11 +++++------
>  drivers/gpu/drm/i915/display/intel_dp_mst.h |  2 +-
>  2 files changed, 6 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> index 2203be28ea01..c2bbba1effc1 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> @@ -634,7 +634,7 @@ intel_dp_create_fake_mst_encoder(struct intel_digital_port *intel_dig_port, enum
>  
>  }
>  
> -static bool
> +static void
>  intel_dp_create_fake_mst_encoders(struct intel_digital_port *intel_dig_port)
>  {
>  	struct intel_dp *intel_dp = &intel_dig_port->dp;
> @@ -643,7 +643,6 @@ intel_dp_create_fake_mst_encoders(struct intel_digital_port *intel_dig_port)
>  
>  	for_each_pipe(dev_priv, pipe)
>  		intel_dp->mst_encoders[pipe] = intel_dp_create_fake_mst_encoder(intel_dig_port, pipe);
> -	return true;
>  }
>  
>  int
> @@ -652,14 +651,13 @@ intel_dp_mst_encoder_active_links(struct intel_digital_port *intel_dig_port)
>  	return intel_dig_port->dp.active_mst_links;
>  }
>  
> -int
> +void
>  intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_base_id)
>  {
>  	struct intel_dp *intel_dp = &intel_dig_port->dp;
>  	struct drm_device *dev = intel_dig_port->base.base.dev;
>  	int ret;
>  
> -	intel_dp->can_mst = true;
>  	intel_dp->mst_mgr.cbs = &mst_cbs;
>  
>  	/* create encoders */
> @@ -668,9 +666,10 @@ intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_ba
>  					   &intel_dp->aux, 16, 3, conn_base_id);
>  	if (ret) {
>  		intel_dp->can_mst = false;
> -		return ret;
> +		return;
>  	}
> -	return 0;

I don't really like the silent failure mode. Maybe we should just fail
the entire connector init when this happens?

> +
> +	intel_dp->can_mst = true;
>  }
>  
>  void
> diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.h b/drivers/gpu/drm/i915/display/intel_dp_mst.h
> index f660ad80db04..f2478c17a8fd 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp_mst.h
> +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.h
> @@ -8,7 +8,7 @@
>  
>  struct intel_digital_port;
>  
> -int intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_id);
> +void intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_id);
>  void intel_dp_mst_encoder_cleanup(struct intel_digital_port *intel_dig_port);
>  int intel_dp_mst_encoder_active_links(struct intel_digital_port *intel_dig_port);
>  
> -- 
> 2.23.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH 3/7] drm/i915: fix port checks for MST support on gen >= 11

[Ville Syrjälä]

On Thu, Oct 10, 2019 at 06:09:03PM -0700, Lucas De Marchi wrote:
> Both Ice Lake and Elkhart Lake (gen 11) support MST on all external
> connections except DDI A. Tiger Lake (gen 12) supports on all external
> connections.
> 
> Move the check to happen inside intel_dp_mst_encoder_init() and add
> specific platform checks.
> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_dp.c     |  7 ++-----
>  drivers/gpu/drm/i915/display/intel_dp_mst.c | 15 +++++++++++++--
>  2 files changed, 15 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
> index 0e45c61d7331..348a09890611 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -7268,11 +7268,8 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
>  		intel_connector->get_hw_state = intel_connector_get_hw_state;
>  
>  	/* init MST on ports that can support it */
> -	if (HAS_DP_MST(dev_priv) && !intel_dp_is_edp(intel_dp) &&
> -	    (port == PORT_B || port == PORT_C ||
> -	     port == PORT_D || port == PORT_F))
> -		intel_dp_mst_encoder_init(intel_dig_port,
> -					  intel_connector->base.base.id);
> +	intel_dp_mst_encoder_init(intel_dig_port,
> +				  intel_connector->base.base.id);
>  
>  	if (!intel_edp_init_connector(intel_dp, intel_connector)) {
>  		intel_dp_aux_fini(intel_dp);
> diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> index c2bbba1effc1..8dcb578e6d01 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> @@ -654,15 +654,26 @@ intel_dp_mst_encoder_active_links(struct intel_digital_port *intel_dig_port)
>  void
>  intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_base_id)
>  {
> +	struct drm_i915_private *i915 = to_i915(intel_dig_port->base.base.dev);
>  	struct intel_dp *intel_dp = &intel_dig_port->dp;
> -	struct drm_device *dev = intel_dig_port->base.base.dev;
> +	enum port port = intel_dig_port->base.port;
>  	int ret;
>  
> +	if (!HAS_DP_MST(i915) || intel_dp_is_edp(intel_dp))
> +		return;
> +
> +	if (INTEL_GEN(i915) == 11 && port == PORT_A)
> +		return;
> +
> +	if (INTEL_GEN(i915) < 11 &&
> +	    port != PORT_B && port != PORT_C && port != PORT_D && port != PORT_F)
> +		return;

This == vs. != is rather hard on the poor old brain.

If we replace the latter with '==PORT_A || ==PORT_E'
I think it'll be easier to grasp what's going on.

> +
>  	intel_dp->mst_mgr.cbs = &mst_cbs;
>  
>  	/* create encoders */
>  	intel_dp_create_fake_mst_encoders(intel_dig_port);
> -	ret = drm_dp_mst_topology_mgr_init(&intel_dp->mst_mgr, dev,
> +	ret = drm_dp_mst_topology_mgr_init(&intel_dp->mst_mgr, &i915->drm,
>  					   &intel_dp->aux, 16, 3, conn_base_id);
>  	if (ret) {
>  		intel_dp->can_mst = false;
> -- 
> 2.23.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH 4/7] drm/i915: remove extra new line on pipe_config mismatch

[Ville Syrjälä]

On Thu, Oct 10, 2019 at 06:09:04PM -0700, Lucas De Marchi wrote:
> The new line is already added by pipe_config_mismatch(), so the callers
> shouldn't add it.

I guess fallout from commit 48c38154d539 ("drm/i915: use DRM_DEBUG_KMS()
instead of drm_dbg(DRM_UT_KMS, ...)") ?

Looks correct to me.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_display.c | 22 ++++++++++----------
>  1 file changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index a146ec02a0c1..c5985f0b5bbf 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -12581,7 +12581,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
>  #define PIPE_CONF_CHECK_X(name) do { \
>  	if (current_config->name != pipe_config->name) { \
>  		pipe_config_mismatch(fastset, __stringify(name), \
> -				     "(expected 0x%08x, found 0x%08x)\n", \
> +				     "(expected 0x%08x, found 0x%08x)", \
>  				     current_config->name, \
>  				     pipe_config->name); \
>  		ret = false; \
> @@ -12591,7 +12591,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
>  #define PIPE_CONF_CHECK_I(name) do { \
>  	if (current_config->name != pipe_config->name) { \
>  		pipe_config_mismatch(fastset, __stringify(name), \
> -				     "(expected %i, found %i)\n", \
> +				     "(expected %i, found %i)", \
>  				     current_config->name, \
>  				     pipe_config->name); \
>  		ret = false; \
> @@ -12601,7 +12601,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
>  #define PIPE_CONF_CHECK_BOOL(name) do { \
>  	if (current_config->name != pipe_config->name) { \
>  		pipe_config_mismatch(fastset, __stringify(name), \
> -				     "(expected %s, found %s)\n", \
> +				     "(expected %s, found %s)", \
>  				     yesno(current_config->name), \
>  				     yesno(pipe_config->name)); \
>  		ret = false; \
> @@ -12618,7 +12618,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
>  		PIPE_CONF_CHECK_BOOL(name); \
>  	} else { \
>  		pipe_config_mismatch(fastset, __stringify(name), \
> -				     "unable to verify whether state matches exactly, forcing modeset (expected %s, found %s)\n", \
> +				     "unable to verify whether state matches exactly, forcing modeset (expected %s, found %s)", \
>  				     yesno(current_config->name), \
>  				     yesno(pipe_config->name)); \
>  		ret = false; \
> @@ -12628,7 +12628,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
>  #define PIPE_CONF_CHECK_P(name) do { \
>  	if (current_config->name != pipe_config->name) { \
>  		pipe_config_mismatch(fastset, __stringify(name), \
> -				     "(expected %p, found %p)\n", \
> +				     "(expected %p, found %p)", \
>  				     current_config->name, \
>  				     pipe_config->name); \
>  		ret = false; \
> @@ -12641,7 +12641,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
>  				    !fastset)) { \
>  		pipe_config_mismatch(fastset, __stringify(name), \
>  				     "(expected tu %i gmch %i/%i link %i/%i, " \
> -				     "found tu %i, gmch %i/%i link %i/%i)\n", \
> +				     "found tu %i, gmch %i/%i link %i/%i)", \
>  				     current_config->name.tu, \
>  				     current_config->name.gmch_m, \
>  				     current_config->name.gmch_n, \
> @@ -12669,7 +12669,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
>  		pipe_config_mismatch(fastset, __stringify(name), \
>  				     "(expected tu %i gmch %i/%i link %i/%i, " \
>  				     "or tu %i gmch %i/%i link %i/%i, " \
> -				     "found tu %i, gmch %i/%i link %i/%i)\n", \
> +				     "found tu %i, gmch %i/%i link %i/%i)", \
>  				     current_config->name.tu, \
>  				     current_config->name.gmch_m, \
>  				     current_config->name.gmch_n, \
> @@ -12692,7 +12692,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
>  #define PIPE_CONF_CHECK_FLAGS(name, mask) do { \
>  	if ((current_config->name ^ pipe_config->name) & (mask)) { \
>  		pipe_config_mismatch(fastset, __stringify(name), \
> -				     "(%x) (expected %i, found %i)\n", \
> +				     "(%x) (expected %i, found %i)", \
>  				     (mask), \
>  				     current_config->name & (mask), \
>  				     pipe_config->name & (mask)); \
> @@ -12703,7 +12703,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
>  #define PIPE_CONF_CHECK_CLOCK_FUZZY(name) do { \
>  	if (!intel_fuzzy_clock_check(current_config->name, pipe_config->name)) { \
>  		pipe_config_mismatch(fastset, __stringify(name), \
> -				     "(expected %i, found %i)\n", \
> +				     "(expected %i, found %i)", \
>  				     current_config->name, \
>  				     pipe_config->name); \
>  		ret = false; \
> @@ -12723,7 +12723,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
>  #define PIPE_CONF_CHECK_COLOR_LUT(name1, name2, bit_precision) do { \
>  	if (current_config->name1 != pipe_config->name1) { \
>  		pipe_config_mismatch(fastset, __stringify(name1), \
> -				"(expected %i, found %i, won't compare lut values)\n", \
> +				"(expected %i, found %i, won't compare lut values)", \
>  				current_config->name1, \
>  				pipe_config->name1); \
>  		ret = false;\
> @@ -12732,7 +12732,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
>  					pipe_config->name2, pipe_config->name1, \
>  					bit_precision)) { \
>  			pipe_config_mismatch(fastset, __stringify(name2), \
> -					"hw_state doesn't match sw_state\n"); \
> +					"hw_state doesn't match sw_state"); \
>  			ret = false; \
>  		} \
>  	} \
> -- 
> 2.23.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH 5/7] drm/i915: add pipe name to pipe mismatch logs

[Ville Syrjälä]

On Thu, Oct 10, 2019 at 06:09:05PM -0700, Lucas De Marchi wrote:
> This way it's easier to figure out what didn't match when we have
> multiple pipes enabled.
> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_display.c | 33 +++++++++++---------
>  1 file changed, 18 insertions(+), 15 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index c5985f0b5bbf..fbc1f01f70d8 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -12526,8 +12526,9 @@ pipe_config_infoframe_mismatch(struct drm_i915_private *dev_priv,
>  	}
>  }
>  
> -static void __printf(3, 4)
> -pipe_config_mismatch(bool fastset, const char *name, const char *format, ...)
> +static void __printf(4, 5)
> +pipe_config_mismatch(bool fastset, const char *crtc_name, const char *name,
> +		     const char *format, ...)

I would just pass the crtc and use the canonical [CRTC:%d:%s] format.

>  {
>  	struct va_format vaf;
>  	va_list args;
> @@ -12537,9 +12538,10 @@ pipe_config_mismatch(bool fastset, const char *name, const char *format, ...)
>  	vaf.va = &args;
>  
>  	if (fastset)
> -		DRM_DEBUG_KMS("fastset mismatch in %s %pV\n", name, &vaf);
> +		DRM_DEBUG_KMS("[%s] fastset mismatch in %s %pV\n",
> +			      crtc_name, name, &vaf);
>  	else
> -		DRM_ERROR("mismatch in %s %pV\n", name, &vaf);
> +		DRM_ERROR("[%s] mismatch in %s %pV\n", crtc_name, name, &vaf);
>  
>  	va_end(args);
>  }
> @@ -12567,6 +12569,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
>  			  bool fastset)
>  {
>  	struct drm_i915_private *dev_priv = to_i915(current_config->base.crtc->dev);
> +	const char *crtc_name = pipe_config->base.crtc->name;
>  	bool ret = true;
>  	u32 bp_gamma = 0;
>  	bool fixup_inherited = fastset &&
> @@ -12580,7 +12583,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
>  
>  #define PIPE_CONF_CHECK_X(name) do { \
>  	if (current_config->name != pipe_config->name) { \
> -		pipe_config_mismatch(fastset, __stringify(name), \
> +		pipe_config_mismatch(fastset, crtc_name, __stringify(name), \
>  				     "(expected 0x%08x, found 0x%08x)", \
>  				     current_config->name, \
>  				     pipe_config->name); \
> @@ -12590,7 +12593,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
>  
>  #define PIPE_CONF_CHECK_I(name) do { \
>  	if (current_config->name != pipe_config->name) { \
> -		pipe_config_mismatch(fastset, __stringify(name), \
> +		pipe_config_mismatch(fastset, crtc_name, __stringify(name), \
>  				     "(expected %i, found %i)", \
>  				     current_config->name, \
>  				     pipe_config->name); \
> @@ -12600,7 +12603,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
>  
>  #define PIPE_CONF_CHECK_BOOL(name) do { \
>  	if (current_config->name != pipe_config->name) { \
> -		pipe_config_mismatch(fastset, __stringify(name), \
> +		pipe_config_mismatch(fastset, crtc_name,  __stringify(name), \
>  				     "(expected %s, found %s)", \
>  				     yesno(current_config->name), \
>  				     yesno(pipe_config->name)); \
> @@ -12617,7 +12620,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
>  	if (!fixup_inherited || (!current_config->name && !pipe_config->name)) { \
>  		PIPE_CONF_CHECK_BOOL(name); \
>  	} else { \
> -		pipe_config_mismatch(fastset, __stringify(name), \
> +		pipe_config_mismatch(fastset, crtc_name, __stringify(name), \
>  				     "unable to verify whether state matches exactly, forcing modeset (expected %s, found %s)", \
>  				     yesno(current_config->name), \
>  				     yesno(pipe_config->name)); \
> @@ -12627,7 +12630,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
>  
>  #define PIPE_CONF_CHECK_P(name) do { \
>  	if (current_config->name != pipe_config->name) { \
> -		pipe_config_mismatch(fastset, __stringify(name), \
> +		pipe_config_mismatch(fastset, crtc_name, __stringify(name), \
>  				     "(expected %p, found %p)", \
>  				     current_config->name, \
>  				     pipe_config->name); \
> @@ -12639,7 +12642,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
>  	if (!intel_compare_link_m_n(&current_config->name, \
>  				    &pipe_config->name,\
>  				    !fastset)) { \
> -		pipe_config_mismatch(fastset, __stringify(name), \
> +		pipe_config_mismatch(fastset, crtc_name, __stringify(name), \
>  				     "(expected tu %i gmch %i/%i link %i/%i, " \
>  				     "found tu %i, gmch %i/%i link %i/%i)", \
>  				     current_config->name.tu, \
> @@ -12666,7 +12669,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
>  				    &pipe_config->name, !fastset) && \
>  	    !intel_compare_link_m_n(&current_config->alt_name, \
>  				    &pipe_config->name, !fastset)) { \
> -		pipe_config_mismatch(fastset, __stringify(name), \
> +		pipe_config_mismatch(fastset, crtc_name, __stringify(name), \
>  				     "(expected tu %i gmch %i/%i link %i/%i, " \
>  				     "or tu %i gmch %i/%i link %i/%i, " \
>  				     "found tu %i, gmch %i/%i link %i/%i)", \
> @@ -12691,7 +12694,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
>  
>  #define PIPE_CONF_CHECK_FLAGS(name, mask) do { \
>  	if ((current_config->name ^ pipe_config->name) & (mask)) { \
> -		pipe_config_mismatch(fastset, __stringify(name), \
> +		pipe_config_mismatch(fastset, crtc_name, __stringify(name), \
>  				     "(%x) (expected %i, found %i)", \
>  				     (mask), \
>  				     current_config->name & (mask), \
> @@ -12702,7 +12705,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
>  
>  #define PIPE_CONF_CHECK_CLOCK_FUZZY(name) do { \
>  	if (!intel_fuzzy_clock_check(current_config->name, pipe_config->name)) { \
> -		pipe_config_mismatch(fastset, __stringify(name), \
> +		pipe_config_mismatch(fastset, crtc_name, __stringify(name), \
>  				     "(expected %i, found %i)", \
>  				     current_config->name, \
>  				     pipe_config->name); \
> @@ -12722,7 +12725,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
>  
>  #define PIPE_CONF_CHECK_COLOR_LUT(name1, name2, bit_precision) do { \
>  	if (current_config->name1 != pipe_config->name1) { \
> -		pipe_config_mismatch(fastset, __stringify(name1), \
> +		pipe_config_mismatch(fastset, crtc_name, __stringify(name1), \
>  				"(expected %i, found %i, won't compare lut values)", \
>  				current_config->name1, \
>  				pipe_config->name1); \
> @@ -12731,7 +12734,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
>  		if (!intel_color_lut_equal(current_config->name2, \
>  					pipe_config->name2, pipe_config->name1, \
>  					bit_precision)) { \
> -			pipe_config_mismatch(fastset, __stringify(name2), \
> +			pipe_config_mismatch(fastset, crtc_name, __stringify(name2), \
>  					"hw_state doesn't match sw_state"); \
>  			ret = false; \
>  		} \
> -- 
> 2.23.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH 6/7] drm/i915: prettify MST debug message

[Ville Syrjälä]

On Thu, Oct 10, 2019 at 06:09:06PM -0700, Lucas De Marchi wrote:
> s/?/:/ so it's get correctly colored by dmesg.

What do you mean correctly?

The debug message was asking the question "(is) MST supported?"
After this it just declares that MST is not supported. I guess no real
difference so I could live with either one.

The only thing that slightly bothers me with the ':' is that the
port/sink/modparam also use it, but in a slightly different way
so the "MST supported:" ':' looks a bit naked.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_dp.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
> index 348a09890611..33a55da89ce9 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -4450,7 +4450,7 @@ intel_dp_configure_mst(struct intel_dp *intel_dp)
>  		&dp_to_dig_port(intel_dp)->base;
>  	bool sink_can_mst = intel_dp_sink_can_mst(intel_dp);
>  
> -	DRM_DEBUG_KMS("[ENCODER:%d:%s] MST support? port: %s, sink: %s, modparam: %s\n",
> +	DRM_DEBUG_KMS("[ENCODER:%d:%s] MST support: port: %s, sink: %s, modparam: %s\n",
>  		      encoder->base.base.id, encoder->base.name,
>  		      yesno(intel_dp->can_mst), yesno(sink_can_mst),
>  		      yesno(i915_modparams.enable_dp_mst));
> -- 
> 2.23.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.IGT: success for Small fixes before fixing MST

[Patchwork]

== Series Details ==

Series: Small fixes before fixing MST
URL   : https://patchwork.freedesktop.org/series/67883/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_7060_full -> Patchwork_14763_full
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  

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

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

### IGT changes ###

#### Issues hit ####

  * igt@gem_exec_balancer@smoke:
    - shard-iclb:         [PASS][1] -> [SKIP][2] ([fdo#110854])
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-iclb1/igt@gem_exec_balancer@smoke.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-iclb7/igt@gem_exec_balancer@smoke.html

  * igt@gem_exec_schedule@reorder-wide-bsd:
    - shard-iclb:         [PASS][3] -> [SKIP][4] ([fdo#111325]) +2 similar issues
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-iclb6/igt@gem_exec_schedule@reorder-wide-bsd.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-iclb4/igt@gem_exec_schedule@reorder-wide-bsd.html

  * igt@gem_userptr_blits@sync-unmap-after-close:
    - shard-hsw:          [PASS][5] -> [DMESG-WARN][6] ([fdo#111870])
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-hsw8/igt@gem_userptr_blits@sync-unmap-after-close.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-hsw4/igt@gem_userptr_blits@sync-unmap-after-close.html

  * igt@gem_userptr_blits@sync-unmap-cycles:
    - shard-snb:          [PASS][7] -> [DMESG-WARN][8] ([fdo#111870])
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-snb1/igt@gem_userptr_blits@sync-unmap-cycles.html
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-snb5/igt@gem_userptr_blits@sync-unmap-cycles.html

  * igt@i915_suspend@sysfs-reader:
    - shard-apl:          [PASS][9] -> [DMESG-WARN][10] ([fdo#108566]) +5 similar issues
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-apl8/igt@i915_suspend@sysfs-reader.html
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-apl7/igt@i915_suspend@sysfs-reader.html

  * igt@kms_atomic@plane_cursor_legacy:
    - shard-apl:          [PASS][11] -> [INCOMPLETE][12] ([fdo#103927]) +1 similar issue
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-apl4/igt@kms_atomic@plane_cursor_legacy.html
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-apl2/igt@kms_atomic@plane_cursor_legacy.html

  * igt@kms_cursor_crc@pipe-b-cursor-suspend:
    - shard-kbl:          [PASS][13] -> [INCOMPLETE][14] ([fdo#103665])
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-kbl3/igt@kms_cursor_crc@pipe-b-cursor-suspend.html
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-kbl3/igt@kms_cursor_crc@pipe-b-cursor-suspend.html

  * igt@kms_flip@2x-flip-vs-suspend:
    - shard-hsw:          [PASS][15] -> [INCOMPLETE][16] ([fdo#103540]) +1 similar issue
   [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-hsw7/igt@kms_flip@2x-flip-vs-suspend.html
   [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-hsw5/igt@kms_flip@2x-flip-vs-suspend.html

  * igt@kms_flip_tiling@flip-changes-tiling-yf:
    - shard-skl:          [PASS][17] -> [FAIL][18] ([fdo#108303])
   [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-skl8/igt@kms_flip_tiling@flip-changes-tiling-yf.html
   [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-skl8/igt@kms_flip_tiling@flip-changes-tiling-yf.html

  * igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-mmap-cpu:
    - shard-iclb:         [PASS][19] -> [FAIL][20] ([fdo#103167]) +1 similar issue
   [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-iclb4/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-mmap-cpu.html
   [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-iclb2/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-mmap-cpu.html

  * igt@kms_psr@psr2_dpms:
    - shard-iclb:         [PASS][21] -> [SKIP][22] ([fdo#109441])
   [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-iclb2/igt@kms_psr@psr2_dpms.html
   [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-iclb1/igt@kms_psr@psr2_dpms.html

  * igt@perf@polling:
    - shard-skl:          [PASS][23] -> [FAIL][24] ([fdo#110728])
   [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-skl6/igt@perf@polling.html
   [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-skl9/igt@perf@polling.html

  * igt@prime_busy@hang-bsd2:
    - shard-iclb:         [PASS][25] -> [SKIP][26] ([fdo#109276]) +19 similar issues
   [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-iclb4/igt@prime_busy@hang-bsd2.html
   [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-iclb6/igt@prime_busy@hang-bsd2.html

  * igt@tools_test@tools_test:
    - shard-snb:          [PASS][27] -> [SKIP][28] ([fdo#109271])
   [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-snb2/igt@tools_test@tools_test.html
   [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-snb5/igt@tools_test@tools_test.html

  
#### Possible fixes ####

  * igt@gem_eio@in-flight-contexts-10ms:
    - shard-hsw:          [FAIL][29] ([fdo#111925]) -> [PASS][30]
   [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-hsw4/igt@gem_eio@in-flight-contexts-10ms.html
   [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-hsw4/igt@gem_eio@in-flight-contexts-10ms.html

  * igt@gem_eio@in-flight-contexts-immediate:
    - shard-snb:          [FAIL][31] ([fdo#111925]) -> [PASS][32]
   [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-snb2/igt@gem_eio@in-flight-contexts-immediate.html
   [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-snb6/igt@gem_eio@in-flight-contexts-immediate.html

  * igt@gem_eio@unwedge-stress:
    - shard-snb:          [FAIL][33] ([fdo#109661]) -> [PASS][34]
   [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-snb5/igt@gem_eio@unwedge-stress.html
   [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-snb7/igt@gem_eio@unwedge-stress.html

  * igt@gem_exec_schedule@deep-bsd:
    - shard-iclb:         [SKIP][35] ([fdo#111325]) -> [PASS][36] +3 similar issues
   [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-iclb1/igt@gem_exec_schedule@deep-bsd.html
   [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-iclb8/igt@gem_exec_schedule@deep-bsd.html

  * igt@gem_exec_schedule@preempt-queue-bsd1:
    - shard-iclb:         [SKIP][37] ([fdo#109276]) -> [PASS][38] +17 similar issues
   [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-iclb6/igt@gem_exec_schedule@preempt-queue-bsd1.html
   [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-iclb4/igt@gem_exec_schedule@preempt-queue-bsd1.html

  * igt@gem_persistent_relocs@forked-faulting-reloc-thrashing:
    - shard-skl:          [DMESG-WARN][39] -> [PASS][40]
   [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-skl1/igt@gem_persistent_relocs@forked-faulting-reloc-thrashing.html
   [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-skl2/igt@gem_persistent_relocs@forked-faulting-reloc-thrashing.html

  * igt@gem_tiled_swapping@non-threaded:
    - shard-hsw:          [INCOMPLETE][41] ([fdo#103540] / [fdo#108686]) -> [PASS][42]
   [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-hsw8/igt@gem_tiled_swapping@non-threaded.html
   [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-hsw4/igt@gem_tiled_swapping@non-threaded.html

  * igt@gem_userptr_blits@dmabuf-unsync:
    - shard-hsw:          [DMESG-WARN][43] ([fdo#111870]) -> [PASS][44]
   [43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-hsw5/igt@gem_userptr_blits@dmabuf-unsync.html
   [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-hsw1/igt@gem_userptr_blits@dmabuf-unsync.html

  * igt@i915_selftest@live_hangcheck:
    - shard-iclb:         [INCOMPLETE][45] ([fdo#107713] / [fdo#108569]) -> [PASS][46]
   [45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-iclb1/igt@i915_selftest@live_hangcheck.html
   [46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-iclb8/igt@i915_selftest@live_hangcheck.html

  * igt@kms_big_fb@x-tiled-16bpp-rotate-180:
    - shard-snb:          [SKIP][47] ([fdo#109271]) -> [PASS][48] +2 similar issues
   [47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-snb1/igt@kms_big_fb@x-tiled-16bpp-rotate-180.html
   [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-snb2/igt@kms_big_fb@x-tiled-16bpp-rotate-180.html

  * igt@kms_color@pipe-b-ctm-0-25:
    - shard-skl:          [DMESG-WARN][49] ([fdo#106107]) -> [PASS][50]
   [49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-skl8/igt@kms_color@pipe-b-ctm-0-25.html
   [50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-skl2/igt@kms_color@pipe-b-ctm-0-25.html

  * igt@kms_cursor_crc@pipe-b-cursor-256x256-offscreen:
    - shard-skl:          [FAIL][51] ([fdo#103232]) -> [PASS][52]
   [51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-skl3/igt@kms_cursor_crc@pipe-b-cursor-256x256-offscreen.html
   [52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-skl3/igt@kms_cursor_crc@pipe-b-cursor-256x256-offscreen.html

  * igt@kms_fbcon_fbt@psr-suspend:
    - shard-iclb:         [DMESG-WARN][53] -> [PASS][54]
   [53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-iclb4/igt@kms_fbcon_fbt@psr-suspend.html
   [54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-iclb5/igt@kms_fbcon_fbt@psr-suspend.html

  * igt@kms_flip@flip-vs-expired-vblank:
    - shard-skl:          [FAIL][55] ([fdo#105363]) -> [PASS][56]
   [55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-skl10/igt@kms_flip@flip-vs-expired-vblank.html
   [56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-skl8/igt@kms_flip@flip-vs-expired-vblank.html

  * igt@kms_frontbuffer_tracking@fbc-suspend:
    - shard-apl:          [DMESG-WARN][57] ([fdo#108566]) -> [PASS][58] +6 similar issues
   [57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-apl7/igt@kms_frontbuffer_tracking@fbc-suspend.html
   [58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-apl8/igt@kms_frontbuffer_tracking@fbc-suspend.html

  * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-plflip-blt:
    - shard-iclb:         [FAIL][59] ([fdo#103167]) -> [PASS][60] +4 similar issues
   [59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-iclb5/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-plflip-blt.html
   [60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-iclb5/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-plflip-blt.html

  * igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-indfb-draw-mmap-cpu:
    - {shard-tglb}:       [INCOMPLETE][61] ([fdo#111747]) -> [PASS][62]
   [61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-tglb8/igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-indfb-draw-mmap-cpu.html
   [62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-tglb4/igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-indfb-draw-mmap-cpu.html

  * igt@kms_frontbuffer_tracking@psr-suspend:
    - {shard-tglb}:       [INCOMPLETE][63] ([fdo#111832]) -> [PASS][64] +1 similar issue
   [63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-tglb1/igt@kms_frontbuffer_tracking@psr-suspend.html
   [64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-tglb6/igt@kms_frontbuffer_tracking@psr-suspend.html

  * igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
    - shard-skl:          [FAIL][65] ([fdo#108145]) -> [PASS][66]
   [65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-skl2/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html
   [66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-skl4/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html

  * igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
    - shard-skl:          [FAIL][67] ([fdo#108145] / [fdo#110403]) -> [PASS][68]
   [67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-skl3/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
   [68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-skl3/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html

  * igt@kms_plane_lowres@pipe-a-tiling-x:
    - shard-iclb:         [FAIL][69] ([fdo#103166]) -> [PASS][70]
   [69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-iclb1/igt@kms_plane_lowres@pipe-a-tiling-x.html
   [70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-iclb8/igt@kms_plane_lowres@pipe-a-tiling-x.html

  * igt@kms_psr2_su@page_flip:
    - shard-iclb:         [SKIP][71] ([fdo#109642] / [fdo#111068]) -> [PASS][72]
   [71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-iclb7/igt@kms_psr2_su@page_flip.html
   [72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-iclb2/igt@kms_psr2_su@page_flip.html

  * igt@kms_psr@psr2_cursor_mmap_cpu:
    - shard-iclb:         [SKIP][73] ([fdo#109441]) -> [PASS][74]
   [73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-iclb7/igt@kms_psr@psr2_cursor_mmap_cpu.html
   [74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_cpu.html

  * igt@kms_setmode@basic:
    - shard-kbl:          [FAIL][75] ([fdo#99912]) -> [PASS][76]
   [75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-kbl4/igt@kms_setmode@basic.html
   [76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-kbl7/igt@kms_setmode@basic.html

  * igt@perf@short-reads:
    - shard-apl:          [FAIL][77] ([fdo#103183]) -> [PASS][78]
   [77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-apl4/igt@perf@short-reads.html
   [78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-apl2/igt@perf@short-reads.html

  
#### Warnings ####

  * igt@gem_ctx_isolation@vcs1-nonpriv:
    - shard-iclb:         [FAIL][79] ([fdo#111329]) -> [SKIP][80] ([fdo#109276])
   [79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-iclb1/igt@gem_ctx_isolation@vcs1-nonpriv.html
   [80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-iclb8/igt@gem_ctx_isolation@vcs1-nonpriv.html

  * igt@gem_mocs_settings@mocs-rc6-bsd2:
    - shard-iclb:         [SKIP][81] ([fdo#109276]) -> [FAIL][82] ([fdo#111330])
   [81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7060/shard-iclb6/igt@gem_mocs_settings@mocs-rc6-bsd2.html
   [82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14763/shard-iclb1/igt@gem_mocs_settings@mocs-rc6-bsd2.html

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

  [fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
  [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
  [fdo#103183]: https://bugs.freedesktop.org/show_bug.cgi?id=103183
  [fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
  [fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
  [fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
  [fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
  [fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
  [fdo#106107]: https://bugs.freedesktop.org/show_bug.cgi?id=106107
  [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
  [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
  [fdo#108303]: https://bugs.freedesktop.org/show_bug.cgi?id=108303
  [fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
  [fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
  [fdo#108686]: https://bugs.freedesktop.org/show_bug.cgi?id=108686
  [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
  [fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
  [fdo#109661]: https://bugs.freedesktop.org/show_bug.cgi?id=109661
  [fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
  [fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728
  [fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854
  [fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
  [fdo#111325]: https://bugs.freedesktop.org/show_bug.cgi?id=111325
  [fdo#111329]: https://bugs.freedesktop.org/show_bug.cgi?id=111329
  [fdo#111330]: https://bugs.freedesktop.org/show_bug.cgi?id=111330
  [fdo#111747]: https://bugs.freedesktop.org/show_bug.cgi?id=111747
  [fdo#111832]: https://bugs.freedesktop.org/show_bug.cgi?id=111832
  [fdo#111870]: https://bugs.freedesktop.org/show_bug.cgi?id=111870
  [fdo#111925]: https://bugs.freedesktop.org/show_bug.cgi?id=111925
  [fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912


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

  Additional (1): pig-skl-6260u 


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

  * CI: CI-20190529 -> None
  * Linux: CI_DRM_7060 -> Patchwork_14763

  CI-20190529: 20190529
  CI_DRM_7060: bac86c35889cffa19d3f7368904c542edde4fafc @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_5220: 1e38e32d721210a780198c8293a6b8c8e881df68 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_14763: 8ff3e4c04eeecc2f17d6d7ac8836487f8252db17 @ 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_14763/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH 6/7] drm/i915: prettify MST debug message

[Lucas De Marchi]

On Fri, Oct 11, 2019 at 03:08:50PM +0300, Ville Syrjälä wrote:
>On Thu, Oct 10, 2019 at 06:09:06PM -0700, Lucas De Marchi wrote:
>> s/?/:/ so it's get correctly colored by dmesg.
>
>What do you mean correctly?
>
>The debug message was asking the question "(is) MST supported?"
>After this it just declares that MST is not supported. I guess no real
>difference so I could live with either one.
>
>The only thing that slightly bothers me with the ':' is that the
>port/sink/modparam also use it, but in a slightly different way
>so the "MST supported:" ':' looks a bit naked.

What I mean is that dmesg uses the first ":" after [] to colorize.

Before:
*[ENCODER:xx:yyy] MST support? port:* yes, sink: yes, modparam: yes

After:
*[ENCODER:xx:yyy] MST support:* port: yes, sink: yes, modparam: yes

Not really important, just makes more sense IMO.

Lucas De Marchi

>
>Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
>>
>> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
>> ---
>>  drivers/gpu/drm/i915/display/intel_dp.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
>> index 348a09890611..33a55da89ce9 100644
>> --- a/drivers/gpu/drm/i915/display/intel_dp.c
>> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
>> @@ -4450,7 +4450,7 @@ intel_dp_configure_mst(struct intel_dp *intel_dp)
>>  		&dp_to_dig_port(intel_dp)->base;
>>  	bool sink_can_mst = intel_dp_sink_can_mst(intel_dp);
>>
>> -	DRM_DEBUG_KMS("[ENCODER:%d:%s] MST support? port: %s, sink: %s, modparam: %s\n",
>> +	DRM_DEBUG_KMS("[ENCODER:%d:%s] MST support: port: %s, sink: %s, modparam: %s\n",
>>  		      encoder->base.base.id, encoder->base.name,
>>  		      yesno(intel_dp->can_mst), yesno(sink_can_mst),
>>  		      yesno(i915_modparams.enable_dp_mst));
>> --
>> 2.23.0
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
>-- 
>Ville Syrjälä
>Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH 6/7] drm/i915: prettify MST debug message

[Ville Syrjälä]

On Fri, Oct 11, 2019 at 10:08:32AM -0700, Lucas De Marchi wrote:
> On Fri, Oct 11, 2019 at 03:08:50PM +0300, Ville Syrjälä wrote:
> >On Thu, Oct 10, 2019 at 06:09:06PM -0700, Lucas De Marchi wrote:
> >> s/?/:/ so it's get correctly colored by dmesg.
> >
> >What do you mean correctly?
> >
> >The debug message was asking the question "(is) MST supported?"
> >After this it just declares that MST is not supported. I guess no real
> >difference so I could live with either one.
> >
> >The only thing that slightly bothers me with the ':' is that the
> >port/sink/modparam also use it, but in a slightly different way
> >so the "MST supported:" ':' looks a bit naked.
> 
> What I mean is that dmesg uses the first ":" after [] to colorize.
> 
> Before:
> *[ENCODER:xx:yyy] MST support? port:* yes, sink: yes, modparam: yes
> 
> After:
> *[ENCODER:xx:yyy] MST support:* port: yes, sink: yes, modparam: yes

Ah, I guess I so routinely pipe it to a file/less that haven't really
noticed :)

> 
> Not really important, just makes more sense IMO.

You've convinced me.

> 
> Lucas De Marchi
> 
> >
> >Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >
> >>
> >> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> >> ---
> >>  drivers/gpu/drm/i915/display/intel_dp.c | 2 +-
> >>  1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
> >> index 348a09890611..33a55da89ce9 100644
> >> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> >> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> >> @@ -4450,7 +4450,7 @@ intel_dp_configure_mst(struct intel_dp *intel_dp)
> >>  		&dp_to_dig_port(intel_dp)->base;
> >>  	bool sink_can_mst = intel_dp_sink_can_mst(intel_dp);
> >>
> >> -	DRM_DEBUG_KMS("[ENCODER:%d:%s] MST support? port: %s, sink: %s, modparam: %s\n",
> >> +	DRM_DEBUG_KMS("[ENCODER:%d:%s] MST support: port: %s, sink: %s, modparam: %s\n",
> >>  		      encoder->base.base.id, encoder->base.name,
> >>  		      yesno(intel_dp->can_mst), yesno(sink_can_mst),
> >>  		      yesno(i915_modparams.enable_dp_mst));
> >> --
> >> 2.23.0
> >>
> >> _______________________________________________
> >> Intel-gfx mailing list
> >> Intel-gfx@lists.freedesktop.org
> >> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> >
> >-- 
> >Ville Syrjälä
> >Intel

-- 
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH 6/7] drm/i915: prettify MST debug message

[Lucas De Marchi]

On Fri, Oct 11, 2019 at 08:14:32PM +0300, Ville Syrjälä wrote:
>On Fri, Oct 11, 2019 at 10:08:32AM -0700, Lucas De Marchi wrote:
>> On Fri, Oct 11, 2019 at 03:08:50PM +0300, Ville Syrjälä wrote:
>> >On Thu, Oct 10, 2019 at 06:09:06PM -0700, Lucas De Marchi wrote:
>> >> s/?/:/ so it's get correctly colored by dmesg.
>> >
>> >What do you mean correctly?
>> >
>> >The debug message was asking the question "(is) MST supported?"
>> >After this it just declares that MST is not supported. I guess no real
>> >difference so I could live with either one.
>> >
>> >The only thing that slightly bothers me with the ':' is that the
>> >port/sink/modparam also use it, but in a slightly different way
>> >so the "MST supported:" ':' looks a bit naked.
>>
>> What I mean is that dmesg uses the first ":" after [] to colorize.
>>
>> Before:
>> *[ENCODER:xx:yyy] MST support? port:* yes, sink: yes, modparam: yes
>>
>> After:
>> *[ENCODER:xx:yyy] MST support:* port: yes, sink: yes, modparam: yes
>
>Ah, I guess I so routinely pipe it to a file/less that haven't really
>noticed :)

I also do this, but I don't give up the  colors. I use:

dmesg --color=always > test.log

On my computer dmesg is actually a alias to "dmesg --color=always"

And then:

less -R test.log

:)

Lucas De Marchi

>
>>
>> Not really important, just makes more sense IMO.
>
>You've convinced me.
>
>>
>> Lucas De Marchi
>>
>> >
>> >Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>> >
>> >>
>> >> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
>> >> ---
>> >>  drivers/gpu/drm/i915/display/intel_dp.c | 2 +-
>> >>  1 file changed, 1 insertion(+), 1 deletion(-)
>> >>
>> >> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
>> >> index 348a09890611..33a55da89ce9 100644
>> >> --- a/drivers/gpu/drm/i915/display/intel_dp.c
>> >> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
>> >> @@ -4450,7 +4450,7 @@ intel_dp_configure_mst(struct intel_dp *intel_dp)
>> >>  		&dp_to_dig_port(intel_dp)->base;
>> >>  	bool sink_can_mst = intel_dp_sink_can_mst(intel_dp);
>> >>
>> >> -	DRM_DEBUG_KMS("[ENCODER:%d:%s] MST support? port: %s, sink: %s, modparam: %s\n",
>> >> +	DRM_DEBUG_KMS("[ENCODER:%d:%s] MST support: port: %s, sink: %s, modparam: %s\n",
>> >>  		      encoder->base.base.id, encoder->base.name,
>> >>  		      yesno(intel_dp->can_mst), yesno(sink_can_mst),
>> >>  		      yesno(i915_modparams.enable_dp_mst));
>> >> --
>> >> 2.23.0
>> >>
>> >> _______________________________________________
>> >> Intel-gfx mailing list
>> >> Intel-gfx@lists.freedesktop.org
>> >> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>> >
>> >--
>> >Ville Syrjälä
>> >Intel
>
>-- 
>Ville Syrjälä
>Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH 7/7] drm/dp-mst: fix warning on unused var

[Lucas De Marchi]

+dri, +Daniel

On Thu, Oct 10, 2019 at 06:09:07PM -0700, Lucas De Marchi wrote:
>Fixes: 83fa9842afe7 ("drm/dp-mst: Drop connection_mutex check")
>Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
>---
> drivers/gpu/drm/drm_dp_mst_topology.c | 2 --
> 1 file changed, 2 deletions(-)
>
>diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
>index 9364e4f42975..9cccc5e63309 100644
>--- a/drivers/gpu/drm/drm_dp_mst_topology.c
>+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
>@@ -4184,8 +4184,6 @@ EXPORT_SYMBOL(drm_dp_mst_topology_state_funcs);
> struct drm_dp_mst_topology_state *drm_atomic_get_mst_topology_state(struct drm_atomic_state *state,
> 								    struct drm_dp_mst_topology_mgr *mgr)
> {
>-	struct drm_device *dev = mgr->dev;
>-
> 	return to_dp_mst_topology_state(drm_atomic_get_private_obj_state(state, &mgr->base));
> }
> EXPORT_SYMBOL(drm_atomic_get_mst_topology_state);
>-- 
>2.23.0
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 1/7] drm/i915: simplify setting of ddi_io_power_domain

[Souza, Jose]

On Thu, 2019-10-10 at 18:09 -0700, Lucas De Marchi wrote:
> Instead of the ever growing switch, just compute the ddi io power
> domain
> based on the port number.

Reviewed-by: José Roberto de Souza <jose.souza@intel.com>

> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_ddi.c | 43 ++------------------
> ----
>  1 file changed, 3 insertions(+), 40 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c
> b/drivers/gpu/drm/i915/display/intel_ddi.c
> index 6c1315c7bcde..b2776f6044ae 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -4750,46 +4750,9 @@ void intel_ddi_init(struct drm_i915_private
> *dev_priv, enum port port)
>  		intel_encoder->update_complete =
> intel_ddi_update_complete;
>  	}
>  
> -	switch (port) {
> -	case PORT_A:
> -		intel_dig_port->ddi_io_power_domain =
> -			POWER_DOMAIN_PORT_DDI_A_IO;
> -		break;
> -	case PORT_B:
> -		intel_dig_port->ddi_io_power_domain =
> -			POWER_DOMAIN_PORT_DDI_B_IO;
> -		break;
> -	case PORT_C:
> -		intel_dig_port->ddi_io_power_domain =
> -			POWER_DOMAIN_PORT_DDI_C_IO;
> -		break;
> -	case PORT_D:
> -		intel_dig_port->ddi_io_power_domain =
> -			POWER_DOMAIN_PORT_DDI_D_IO;
> -		break;
> -	case PORT_E:
> -		intel_dig_port->ddi_io_power_domain =
> -			POWER_DOMAIN_PORT_DDI_E_IO;
> -		break;
> -	case PORT_F:
> -		intel_dig_port->ddi_io_power_domain =
> -			POWER_DOMAIN_PORT_DDI_F_IO;
> -		break;
> -	case PORT_G:
> -		intel_dig_port->ddi_io_power_domain =
> -			POWER_DOMAIN_PORT_DDI_G_IO;
> -		break;
> -	case PORT_H:
> -		intel_dig_port->ddi_io_power_domain =
> -			POWER_DOMAIN_PORT_DDI_H_IO;
> -		break;
> -	case PORT_I:
> -		intel_dig_port->ddi_io_power_domain =
> -			POWER_DOMAIN_PORT_DDI_I_IO;
> -		break;
> -	default:
> -		MISSING_CASE(port);
> -	}
> +	WARN_ON(port > PORT_I);
> +	intel_dig_port->ddi_io_power_domain =
> POWER_DOMAIN_PORT_DDI_A_IO +
> +					      port - PORT_A;
>  
>  	if (init_dp) {
>  		if (!intel_ddi_init_dp_connector(intel_dig_port))
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH 7/7] drm/dp-mst: fix warning on unused var

[Souza, Jose]

Reviewed-by: José Roberto de Souza <jose.souza@intel.com>

On Thu, 2019-10-10 at 18:09 -0700, Lucas De Marchi wrote:
> Fixes: 83fa9842afe7 ("drm/dp-mst: Drop connection_mutex check")
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> ---
>  drivers/gpu/drm/drm_dp_mst_topology.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c
> b/drivers/gpu/drm/drm_dp_mst_topology.c
> index 9364e4f42975..9cccc5e63309 100644
> --- a/drivers/gpu/drm/drm_dp_mst_topology.c
> +++ b/drivers/gpu/drm/drm_dp_mst_topology.c
> @@ -4184,8 +4184,6 @@ EXPORT_SYMBOL(drm_dp_mst_topology_state_funcs);
>  struct drm_dp_mst_topology_state
> *drm_atomic_get_mst_topology_state(struct drm_atomic_state *state,
>  								    str
> uct drm_dp_mst_topology_mgr *mgr)
>  {
> -	struct drm_device *dev = mgr->dev;
> -
>  	return
> to_dp_mst_topology_state(drm_atomic_get_private_obj_state(state,
> &mgr->base));
>  }
>  EXPORT_SYMBOL(drm_atomic_get_mst_topology_state);
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH 7/7] drm/dp-mst: fix warning on unused var

[Daniel Vetter]

On Fri, Oct 11, 2019 at 10:58:13AM -0700, Lucas De Marchi wrote:
> +dri, +Daniel
> 
> On Thu, Oct 10, 2019 at 06:09:07PM -0700, Lucas De Marchi wrote:
> > Fixes: 83fa9842afe7 ("drm/dp-mst: Drop connection_mutex check")
> > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> > ---
> > drivers/gpu/drm/drm_dp_mst_topology.c | 2 --
> > 1 file changed, 2 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
> > index 9364e4f42975..9cccc5e63309 100644
> > --- a/drivers/gpu/drm/drm_dp_mst_topology.c
> > +++ b/drivers/gpu/drm/drm_dp_mst_topology.c
> > @@ -4184,8 +4184,6 @@ EXPORT_SYMBOL(drm_dp_mst_topology_state_funcs);
> > struct drm_dp_mst_topology_state *drm_atomic_get_mst_topology_state(struct drm_atomic_state *state,
> > 								    struct drm_dp_mst_topology_mgr *mgr)
> > {
> > -	struct drm_device *dev = mgr->dev;
> > -
> > 	return to_dp_mst_topology_state(drm_atomic_get_private_obj_state(state, &mgr->base));
> > }
> > EXPORT_SYMBOL(drm_atomic_get_mst_topology_state);

Thanks for fixing this, pushed.
-Daniel

> > -- 
> > 2.23.0
> > 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 2/7] drm/i915: cleanup unused returns on DP-MST

[Lucas De Marchi]

On Fri, Oct 11, 2019 at 02:48:12PM +0300, Ville Syrjälä wrote:
>On Thu, Oct 10, 2019 at 06:09:02PM -0700, Lucas De Marchi wrote:
>> Those init functions mark their success in the intel_dig_port
>> struct, the return values are not really used.
>>
>> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
>> ---
>>  drivers/gpu/drm/i915/display/intel_dp_mst.c | 11 +++++------
>>  drivers/gpu/drm/i915/display/intel_dp_mst.h |  2 +-
>>  2 files changed, 6 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
>> index 2203be28ea01..c2bbba1effc1 100644
>> --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
>> +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
>> @@ -634,7 +634,7 @@ intel_dp_create_fake_mst_encoder(struct intel_digital_port *intel_dig_port, enum
>>
>>  }
>>
>> -static bool
>> +static void
>>  intel_dp_create_fake_mst_encoders(struct intel_digital_port *intel_dig_port)
>>  {
>>  	struct intel_dp *intel_dp = &intel_dig_port->dp;
>> @@ -643,7 +643,6 @@ intel_dp_create_fake_mst_encoders(struct intel_digital_port *intel_dig_port)
>>
>>  	for_each_pipe(dev_priv, pipe)
>>  		intel_dp->mst_encoders[pipe] = intel_dp_create_fake_mst_encoder(intel_dig_port, pipe);
>> -	return true;
>>  }
>>
>>  int
>> @@ -652,14 +651,13 @@ intel_dp_mst_encoder_active_links(struct intel_digital_port *intel_dig_port)
>>  	return intel_dig_port->dp.active_mst_links;
>>  }
>>
>> -int
>> +void
>>  intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_base_id)
>>  {
>>  	struct intel_dp *intel_dp = &intel_dig_port->dp;
>>  	struct drm_device *dev = intel_dig_port->base.base.dev;
>>  	int ret;
>>
>> -	intel_dp->can_mst = true;
>>  	intel_dp->mst_mgr.cbs = &mst_cbs;
>>
>>  	/* create encoders */
>> @@ -668,9 +666,10 @@ intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_ba
>>  					   &intel_dp->aux, 16, 3, conn_base_id);
>>  	if (ret) {
>>  		intel_dp->can_mst = false;
>> -		return ret;
>> +		return;
>>  	}
>> -	return 0;
>
>I don't really like the silent failure mode. Maybe we should just fail
>the entire connector init when this happens?

ok. For now I will just drop this patch.

Lucas De Marchi

>
>> +
>> +	intel_dp->can_mst = true;
>>  }
>>
>>  void
>> diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.h b/drivers/gpu/drm/i915/display/intel_dp_mst.h
>> index f660ad80db04..f2478c17a8fd 100644
>> --- a/drivers/gpu/drm/i915/display/intel_dp_mst.h
>> +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.h
>> @@ -8,7 +8,7 @@
>>
>>  struct intel_digital_port;
>>
>> -int intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_id);
>> +void intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_id);
>>  void intel_dp_mst_encoder_cleanup(struct intel_digital_port *intel_dig_port);
>>  int intel_dp_mst_encoder_active_links(struct intel_digital_port *intel_dig_port);
>>
>> --
>> 2.23.0
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
>-- 
>Ville Syrjälä
>Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx