Skip to contentSkip to conversation

drm/i915: fix for_each_digital_port

PATCH In review Imre Deak 5 participants 14 messages Apr 17, 2015 – Apr 30, 2015

Subsystems (2)
lore
Share & tools
lore

Imre Deak

author
#0 lore raw

PATCH 1/1 drm/i915: fix for_each_digital_port

We should check if a given encoder is of a digital type before casting it to a digital port object. This broke on HSW when iterating the VGA encoder.

Introduced in
commit b403745c84592b26a0713e6944c2b109f6df5c82

Author: Damien Lespiau <[email protected]>
Date:   Mon Aug 4 22:01:33 2014 +0100

drm/i915: Iterate through the initialized DDIs to prepare their buffers

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90067

---
 drivers/gpu/drm/i915/i915_drv.h  | 10 ++++++----
 drivers/gpu/drm/i915/intel_ddi.c |  3 ++-
 drivers/gpu/drm/i915/intel_drv.h | 10 ++++++++++
 3 files changed, 18 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +6 -4
index 40ef672..7160fc8 100644
@@ -251,10 +251,12 @@ enum hpd_pin {
 			    &dev->mode_config.connector_list,	\
 			    base.head)
 
-#define for_each_digital_port(dev, digital_port)		\
-	list_for_each_entry(digital_port,			\
-			    &dev->mode_config.encoder_list,	\
-			    base.base.head)
+#define for_each_digital_port(dev, __intel_encoder, digital_port)		\
+	list_for_each_entry(__intel_encoder,				\
+			    &dev->mode_config.encoder_list,		\
+			    base.head)					\
+		if (intel_enc_is_digital(__intel_encoder) &&		\
+		    ((digital_port) = enc_to_dig_port(&__intel_encoder->base)))
 
 #define for_each_encoder_on_crtc(dev, __crtc, intel_encoder) \
 	list_for_each_entry((intel_encoder), &(dev)->mode_config.encoder_list, base.head) \
drivers/gpu/drm/i915/intel_ddi.c +2 -1
index 455d44b..b5d7e74 100644
@@ -370,13 +370,14 @@ static void intel_prepare_ddi_buffers(struct drm_device *dev,
  */
 void intel_prepare_ddi(struct drm_device *dev)
 {
+	struct intel_encoder *__intel_encoder;
 	struct intel_digital_port *intel_dig_port;
 	bool visited[I915_MAX_PORTS] = { 0, };
 
 	if (!HAS_DDI(dev))
 		return;
 
-	for_each_digital_port(dev, intel_dig_port) {
+	for_each_digital_port(dev, __intel_encoder, intel_dig_port) {
 		if (visited[intel_dig_port->port])
 			continue;
 
drivers/gpu/drm/i915/intel_drv.h +10 -0
index 23a42a4..a354f26 100644
@@ -870,6 +870,16 @@ hdmi_to_dig_port(struct intel_hdmi *intel_hdmi)
 	return container_of(intel_hdmi, struct intel_digital_port, hdmi);
 }
 
+static inline bool intel_enc_is_digital(struct intel_encoder *intel_encoder)
+{
+	return	intel_encoder->type == INTEL_OUTPUT_HDMI ||
+		intel_encoder->type == INTEL_OUTPUT_DISPLAYPORT ||
+		intel_encoder->type == INTEL_OUTPUT_EDP ||
+		intel_encoder->type == INTEL_OUTPUT_UNKNOWN ||
+		intel_encoder->type == INTEL_OUTPUT_DP_MST;
+
+}
+
 /*
  * Returns the number of planes for this pipe, ie the number of sprites + 1
  * (primary plane). This doesn't count the cursor plane then.
Signature · 6 lines
2.1.0

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
author
#1 lore raw
Quoted 67 lines · Imre Deak

We should check if a given encoder is of a digital type before casting it to a digital port object. This broke on HSW when iterating the VGA encoder.

Introduced in
commit b403745c84592b26a0713e6944c2b109f6df5c82

Author: Damien Lespiau <[email protected]>
Date:   Mon Aug 4 22:01:33 2014 +0100

drm/i915: Iterate through the initialized DDIs to prepare their buffers

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90067

---
 drivers/gpu/drm/i915/i915_drv.h  | 10 ++++++----
 drivers/gpu/drm/i915/intel_ddi.c |  3 ++-
 drivers/gpu/drm/i915/intel_drv.h | 10 ++++++++++
 3 files changed, 18 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +6 -4
index 40ef672..7160fc8 100644
@@ -251,10 +251,12 @@ enum hpd_pin {
 			    &dev->mode_config.connector_list,	\
 			    base.head)
 
-#define for_each_digital_port(dev, digital_port)		\
-	list_for_each_entry(digital_port,			\
-			    &dev->mode_config.encoder_list,	\
-			    base.base.head)
+#define for_each_digital_port(dev, __intel_encoder, digital_port)		\
+	list_for_each_entry(__intel_encoder,				\
+			    &dev->mode_config.encoder_list,		\
+			    base.head)					\
+		if (intel_enc_is_digital(__intel_encoder) &&		\
+		    ((digital_port) = enc_to_dig_port(&__intel_encoder->base)))
 
 #define for_each_encoder_on_crtc(dev, __crtc, intel_encoder) \
 	list_for_each_entry((intel_encoder), &(dev)->mode_config.encoder_list, base.head) \
drivers/gpu/drm/i915/intel_ddi.c +2 -1
index 455d44b..b5d7e74 100644
@@ -370,13 +370,14 @@ static void intel_prepare_ddi_buffers(struct drm_device *dev,
  */
 void intel_prepare_ddi(struct drm_device *dev)
 {
+	struct intel_encoder *__intel_encoder;
 	struct intel_digital_port *intel_dig_port;
 	bool visited[I915_MAX_PORTS] = { 0, };
 
 	if (!HAS_DDI(dev))
 		return;
 
-	for_each_digital_port(dev, intel_dig_port) {
+	for_each_digital_port(dev, __intel_encoder, intel_dig_port) {
 		if (visited[intel_dig_port->port])
 			continue;
 
drivers/gpu/drm/i915/intel_drv.h +0 -0
index 23a42a4..a354f26 100644
@@ -870,6 +870,16 @@ hdmi_to_dig_port(struct intel_hdmi *intel_hdmi)
 	return container_of(intel_hdmi, struct intel_digital_port, hdmi);
 }

drivers/gpu/drm/i915/intel_drv.h hdmi_to_dig_port(struct intel_hdmi *intel_hdmi) · line 881

Quoted 10 lines
drivers/gpu/drm/i915/intel_drv.h +9 -0
 
+static inline bool intel_enc_is_digital(struct intel_encoder *intel_encoder)
+{
+	return	intel_encoder->type == INTEL_OUTPUT_HDMI ||
+		intel_encoder->type == INTEL_OUTPUT_DISPLAYPORT ||
+		intel_encoder->type == INTEL_OUTPUT_EDP ||
+		intel_encoder->type == INTEL_OUTPUT_UNKNOWN ||
+		intel_encoder->type == INTEL_OUTPUT_DP_MST;
+
+}

This should probably have a MISSING_CASE for the other types, I can change that if there are no other comments.

drivers/gpu/drm/i915/intel_drv.h hdmi_to_dig_port(struct intel_hdmi *intel_hdmi) · line 885

Quoted 4 lines
drivers/gpu/drm/i915/intel_drv.h +1 -0
+
 /*
  * Returns the number of planes for this pipe, ie the number of sprites + 1
  * (primary plane). This doesn't count the cursor plane then.

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

#2 lore raw
In reply to Imre Deak

2015-04-17 8:58 GMT-03:00 Imre Deak <[email protected]>:

Quoted 47 lines

We should check if a given encoder is of a digital type before casting it to a digital port object. This broke on HSW when iterating the VGA encoder.

Introduced in
commit b403745c84592b26a0713e6944c2b109f6df5c82

Author: Damien Lespiau <[email protected]>
Date:   Mon Aug 4 22:01:33 2014 +0100

drm/i915: Iterate through the initialized DDIs to prepare their buffers

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90067

---
 drivers/gpu/drm/i915/i915_drv.h  | 10 ++++++----
 drivers/gpu/drm/i915/intel_ddi.c |  3 ++-
 drivers/gpu/drm/i915/intel_drv.h | 10 ++++++++++
 3 files changed, 18 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +6 -4
index 40ef672..7160fc8 100644
@@ -251,10 +251,12 @@ enum hpd_pin {
                            &dev->mode_config.connector_list,   \
                            base.head)
 
-#define for_each_digital_port(dev, digital_port)               \
-       list_for_each_entry(digital_port,                       \
-                           &dev->mode_config.encoder_list,     \
-                           base.base.head)
+#define for_each_digital_port(dev, __intel_encoder, digital_port)              \
+       list_for_each_entry(__intel_encoder,                            \
+                           &dev->mode_config.encoder_list,             \
+                           base.head)                                  \
+               if (intel_enc_is_digital(__intel_encoder) &&            \
+                   ((digital_port) = enc_to_dig_port(&__intel_encoder->base)))
 
 #define for_each_encoder_on_crtc(dev, __crtc, intel_encoder) \
        list_for_each_entry((intel_encoder), &(dev)->mode_config.encoder_list, base.head) \
drivers/gpu/drm/i915/intel_ddi.c +0 -0
index 455d44b..b5d7e74 100644
@@ -370,13 +370,14 @@ static void intel_prepare_ddi_buffers(struct drm_device *dev,
  */
 void intel_prepare_ddi(struct drm_device *dev)

drivers/gpu/drm/i915/intel_ddi.c static void intel_prepare_ddi_buffers(struct drm_device *dev, · line 380

Quoted 10 lines
drivers/gpu/drm/i915/intel_ddi.c +2 -1
 {
+       struct intel_encoder *__intel_encoder;
        struct intel_digital_port *intel_dig_port;
        bool visited[I915_MAX_PORTS] = { 0, };
 
        if (!HAS_DDI(dev))
                return;
 
-       for_each_digital_port(dev, intel_dig_port) {
+       for_each_digital_port(dev, __intel_encoder, intel_dig_port) {

The problem is that now we're not gonna call intel_prepare_ddi_buffers() for PORT_E, which is the CRT port.

Perhaps we could make that function accept intel_encoder() and then somehow call intel_ddi_get_encoder_port() or something... Or maybe just special-case the CRT encoder. Just suggestions...

Quoted 31 lines
drivers/gpu/drm/i915/intel_ddi.c +0 -0
                if (visited[intel_dig_port->port])
                        continue;
 
drivers/gpu/drm/i915/intel_drv.h +10 -1
index 23a42a4..a354f26 100644
@@ -870,6 +870,16 @@ hdmi_to_dig_port(struct intel_hdmi *intel_hdmi)
        return container_of(intel_hdmi, struct intel_digital_port, hdmi);
 }
 
+static inline bool intel_enc_is_digital(struct intel_encoder *intel_encoder)
+{
+       return  intel_encoder->type == INTEL_OUTPUT_HDMI ||
+               intel_encoder->type == INTEL_OUTPUT_DISPLAYPORT ||
+               intel_encoder->type == INTEL_OUTPUT_EDP ||
+               intel_encoder->type == INTEL_OUTPUT_UNKNOWN ||
+               intel_encoder->type == INTEL_OUTPUT_DP_MST;
+
+}
+
 /*
  * Returns the number of planes for this pipe, ie the number of sprites + 1
  * (primary plane). This doesn't count the cursor plane then.
--

2.1.0

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

Signature · 5 lines
Paulo Zanoni
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
author
#3 lore raw
Quoted 62 lines · Paulo Zanoni

2015-04-17 8:58 GMT-03:00 Imre Deak <[email protected]>:

Quoted 47 lines

We should check if a given encoder is of a digital type before casting it to a digital port object. This broke on HSW when iterating the VGA encoder.

Introduced in
commit b403745c84592b26a0713e6944c2b109f6df5c82

Author: Damien Lespiau <[email protected]>
Date:   Mon Aug 4 22:01:33 2014 +0100

drm/i915: Iterate through the initialized DDIs to prepare their buffers

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90067

---
 drivers/gpu/drm/i915/i915_drv.h  | 10 ++++++----
 drivers/gpu/drm/i915/intel_ddi.c |  3 ++-
 drivers/gpu/drm/i915/intel_drv.h | 10 ++++++++++
 3 files changed, 18 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +6 -4
index 40ef672..7160fc8 100644
@@ -251,10 +251,12 @@ enum hpd_pin {
                            &dev->mode_config.connector_list,   \
                            base.head)
 
-#define for_each_digital_port(dev, digital_port)               \
-       list_for_each_entry(digital_port,                       \
-                           &dev->mode_config.encoder_list,     \
-                           base.base.head)
+#define for_each_digital_port(dev, __intel_encoder, digital_port)              \
+       list_for_each_entry(__intel_encoder,                            \
+                           &dev->mode_config.encoder_list,             \
+                           base.head)                                  \
+               if (intel_enc_is_digital(__intel_encoder) &&            \
+                   ((digital_port) = enc_to_dig_port(&__intel_encoder->base)))
 
 #define for_each_encoder_on_crtc(dev, __crtc, intel_encoder) \
        list_for_each_entry((intel_encoder), &(dev)->mode_config.encoder_list, base.head) \
drivers/gpu/drm/i915/intel_ddi.c +0 -0
index 455d44b..b5d7e74 100644
@@ -370,13 +370,14 @@ static void intel_prepare_ddi_buffers(struct drm_device *dev,
  */
 void intel_prepare_ddi(struct drm_device *dev)

drivers/gpu/drm/i915/intel_ddi.c static void intel_prepare_ddi_buffers(struct drm_device *dev, · line 380

Quoted 10 lines
drivers/gpu/drm/i915/intel_ddi.c +2 -1
 {
+       struct intel_encoder *__intel_encoder;
        struct intel_digital_port *intel_dig_port;
        bool visited[I915_MAX_PORTS] = { 0, };
 
        if (!HAS_DDI(dev))
                return;
 
-       for_each_digital_port(dev, intel_dig_port) {
+       for_each_digital_port(dev, __intel_encoder, intel_dig_port) {

The problem is that now we're not gonna call intel_prepare_ddi_buffers() for PORT_E, which is the CRT port.

Quoted 3 lines

Perhaps we could make that function accept intel_encoder() and then somehow call intel_ddi_get_encoder_port() or something... Or maybe just special-case the CRT encoder. Just suggestions...

Thanks for catching this, completely missed that. I also noticed now that MST encoders don't have an embedding digital_port object either, so for those instead of the digital_port port field we were looking at the mst_encoder pipe field :/

I'll try again with the above things fixed.

Quoted 28 lines
Quoted 28 lines
drivers/gpu/drm/i915/intel_ddi.c +0 -0
                if (visited[intel_dig_port->port])
                        continue;
 
drivers/gpu/drm/i915/intel_drv.h +10 -1
index 23a42a4..a354f26 100644
@@ -870,6 +870,16 @@ hdmi_to_dig_port(struct intel_hdmi *intel_hdmi)
        return container_of(intel_hdmi, struct intel_digital_port, hdmi);
 }
 
+static inline bool intel_enc_is_digital(struct intel_encoder *intel_encoder)
+{
+       return  intel_encoder->type == INTEL_OUTPUT_HDMI ||
+               intel_encoder->type == INTEL_OUTPUT_DISPLAYPORT ||
+               intel_encoder->type == INTEL_OUTPUT_EDP ||
+               intel_encoder->type == INTEL_OUTPUT_UNKNOWN ||
+               intel_encoder->type == INTEL_OUTPUT_DP_MST;
+
+}
+
 /*
  * Returns the number of planes for this pipe, ie the number of sprites + 1
  * (primary plane). This doesn't count the cursor plane then.
--

2.1.0

Quoted 7 lines
Quoted 4 lines

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

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

author
#4 lore raw

PATCH v2 1/2 drm/i915: factor out ddi_get_encoder_port

In reply to Imre Deak

In the next patch we'll need to get at both the encoder's intel_digital_port object - which maybe NULL for a CRT - and it's port, so factor out this functionality.

No functional change.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90067

---
 drivers/gpu/drm/i915/intel_ddi.c | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +19 -9
index 455d44b..903d395 100644
@@ -210,29 +210,39 @@ static const struct bxt_ddi_buf_trans bxt_ddi_translations_hdmi[] = {
 	{ 154, 0x9A, 1, 128, true },	/* 9:	1200		0   */
 };
 
-enum port intel_ddi_get_encoder_port(struct intel_encoder *intel_encoder)
+static void ddi_get_encoder_port(struct intel_encoder *intel_encoder,
+				 struct intel_digital_port **dig_port,
+				 enum port *port)
 {
 	struct drm_encoder *encoder = &intel_encoder->base;
 	int type = intel_encoder->type;
 
 	if (type == INTEL_OUTPUT_DP_MST) {
-		struct intel_digital_port *intel_dig_port = enc_to_mst(encoder)->primary;
-		return intel_dig_port->port;
+		*dig_port = enc_to_mst(encoder)->primary;
+		*port = (*dig_port)->port;
 	} else if (type == INTEL_OUTPUT_DISPLAYPORT || type == INTEL_OUTPUT_EDP ||
 	    type == INTEL_OUTPUT_HDMI || type == INTEL_OUTPUT_UNKNOWN) {
-		struct intel_digital_port *intel_dig_port =
-			enc_to_dig_port(encoder);
-		return intel_dig_port->port;
-
+		*dig_port = enc_to_dig_port(encoder);
+		*port = (*dig_port)->port;
 	} else if (type == INTEL_OUTPUT_ANALOG) {
-		return PORT_E;
-
+		*dig_port = NULL;
+		*port = PORT_E;
 	} else {
 		DRM_ERROR("Invalid DDI encoder type %d\n", type);
 		BUG();
 	}
 }
 
+enum port intel_ddi_get_encoder_port(struct intel_encoder *intel_encoder)
+{
+	struct intel_digital_port *dig_port;
+	enum port port;
+
+	ddi_get_encoder_port(intel_encoder, &dig_port, &port);
+
+	return port;
+}
+
 static bool
 intel_dig_port_supports_hdmi(const struct intel_digital_port *intel_dig_port)
 {
Signature · 6 lines
2.1.0

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

PATCH v2 2/2 drm/i915: fix intel_prepare_ddi

At the moment intel_prepare_ddi buffer will iterate through both MST and CRT encoders, which is incorrect. Neither of these encoder types have an embedding intel_digital_port object, so for these encoder types we will use random data when dereferencing the corresponding intel_digital_port->port field.

Introduced in
commit b403745c84592b26a0713e6944c2b109f6df5c82

Author: Damien Lespiau <[email protected]>
Date:   Mon Aug 4 22:01:33 2014 +0100

drm/i915: Iterate through the initialized DDIs to prepare their buffers

v2:
- fix getting at the port for MST encoders too
- make sure that intel_prepare_ddi_buffers() gets called for port E too (Paulo)

---
 drivers/gpu/drm/i915/i915_drv.h  |  5 -----
 drivers/gpu/drm/i915/intel_ddi.c | 28 ++++++++++++++++++----------
 2 files changed, 18 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +0 -5
index 40ef672..c461b56 100644
@@ -251,11 +251,6 @@ enum hpd_pin {
 			    &dev->mode_config.connector_list,	\
 			    base.head)
 
-#define for_each_digital_port(dev, digital_port)		\
-	list_for_each_entry(digital_port,			\
-			    &dev->mode_config.encoder_list,	\
-			    base.base.head)
-
 #define for_each_encoder_on_crtc(dev, __crtc, intel_encoder) \
 	list_for_each_entry((intel_encoder), &(dev)->mode_config.encoder_list, base.head) \
 		if ((intel_encoder)->base.crtc == (__crtc))
drivers/gpu/drm/i915/intel_ddi.c +18 -10
index 903d395..9c1e74a 100644
@@ -256,12 +256,11 @@ intel_dig_port_supports_hdmi(const struct intel_digital_port *intel_dig_port)
  * in either FDI or DP modes only, as HDMI connections will work with both
  * of those
  */
-static void intel_prepare_ddi_buffers(struct drm_device *dev,
-				      struct intel_digital_port *intel_dig_port)
+static void intel_prepare_ddi_buffers(struct drm_device *dev, enum port port,
+				      bool supports_hdmi)
 {
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	u32 reg;
-	int port = intel_dig_port->port;
 	int i, n_hdmi_entries, n_dp_entries, n_edp_entries, hdmi_default_entry,
 	    size;
 	int hdmi_level = dev_priv->vbt.ddi_port_info[port].hdmi_level_shift;
@@ -272,7 +271,7 @@ static void intel_prepare_ddi_buffers(struct drm_device *dev,
 	const struct ddi_buf_trans *ddi_translations;
 
 	if (IS_BROXTON(dev)) {
-		if (!intel_dig_port_supports_hdmi(intel_dig_port))
+		if (!supports_hdmi)
 			return;
 
 		/* Vswing programming for HDMI */
@@ -360,7 +359,7 @@ static void intel_prepare_ddi_buffers(struct drm_device *dev,
 		reg += 4;
 	}
 
-	if (!intel_dig_port_supports_hdmi(intel_dig_port))
+	if (!supports_hdmi)
 		return;
 
 	/* Choose a good default if VBT is badly populated */
@@ -380,18 +379,27 @@ static void intel_prepare_ddi_buffers(struct drm_device *dev,
  */
 void intel_prepare_ddi(struct drm_device *dev)
 {
-	struct intel_digital_port *intel_dig_port;
+	struct intel_encoder *intel_encoder;
 	bool visited[I915_MAX_PORTS] = { 0, };
 
 	if (!HAS_DDI(dev))
 		return;
 
-	for_each_digital_port(dev, intel_dig_port) {
-		if (visited[intel_dig_port->port])
+	for_each_intel_encoder(dev, intel_encoder) {
+		struct intel_digital_port *intel_dig_port;
+		enum port port;
+		bool supports_hdmi;
+
+		ddi_get_encoder_port(intel_encoder, &intel_dig_port, &port);
+
+		if (visited[port])
 			continue;
 
-		intel_prepare_ddi_buffers(dev, intel_dig_port);
-		visited[intel_dig_port->port] = true;
+		supports_hdmi = intel_dig_port &&
+				intel_dig_port_supports_hdmi(intel_dig_port);
+
+		intel_prepare_ddi_buffers(dev, port, supports_hdmi);
+		visited[port] = true;
 	}
 }
 
Signature · 6 lines
2.1.0

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tested-by on v2 2/2
#6 lore raw

Re: [PATCH v2 2/2] drm/i915: fix intel_prepare_ddi

Task id: 6225 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied

PNV                                  276/276              276/276
ILK                                  301/301              301/301
SNB                                  318/318              318/318
IVB                                  345/345              345/345

BYT -1 285/285 284/285
BDW 321/321 321/321
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*BYT igt@kms_setmode@invalid-clone-exclusive-crtc PASS(5) DMESG_WARN(1)PASS(1)
(dmesg patch applied)drm:check_crtc_state[i915]]*ERROR*mismatch_in_has_infoframe(expected#,found#)@mismatch in has_infoframe .* found WARNING:at_drivers/gpu/drm/i915/intel_display.c:#check_crtc_state[i915]()@WARNING:.* at .* check_crtc_state+0x
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by on v2 2/2
#7 lore raw

Re: [PATCH v2 2/2] drm/i915: fix intel_prepare_ddi

In reply to Imre Deak
Quoted 11 lines · Imre Deak

At the moment intel_prepare_ddi buffer will iterate through both MST and CRT encoders, which is incorrect. Neither of these encoder types have an embedding intel_digital_port object, so for these encoder types we will use random data when dereferencing the corresponding intel_digital_port->port field.

Introduced in
commit b403745c84592b26a0713e6944c2b109f6df5c82

Author: Damien Lespiau <[email protected]>
Date:   Mon Aug 4 22:01:33 2014 +0100
Quoted 8 lines

drm/i915: Iterate through the initialized DDIs to prepare their buffers

v2:
- fix getting at the port for MST encoders too
- make sure that intel_prepare_ddi_buffers() gets called for port E too (Paulo)

Signature · 1 line
Damien
Quoted 94 lines
---
 drivers/gpu/drm/i915/i915_drv.h  |  5 -----
 drivers/gpu/drm/i915/intel_ddi.c | 28 ++++++++++++++++++----------
 2 files changed, 18 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +0 -5
index 40ef672..c461b56 100644
@@ -251,11 +251,6 @@ enum hpd_pin {
 			    &dev->mode_config.connector_list,	\
 			    base.head)
 
-#define for_each_digital_port(dev, digital_port)		\
-	list_for_each_entry(digital_port,			\
-			    &dev->mode_config.encoder_list,	\
-			    base.base.head)
-
 #define for_each_encoder_on_crtc(dev, __crtc, intel_encoder) \
 	list_for_each_entry((intel_encoder), &(dev)->mode_config.encoder_list, base.head) \
 		if ((intel_encoder)->base.crtc == (__crtc))
drivers/gpu/drm/i915/intel_ddi.c +18 -10
index 903d395..9c1e74a 100644
@@ -256,12 +256,11 @@ intel_dig_port_supports_hdmi(const struct intel_digital_port *intel_dig_port)
  * in either FDI or DP modes only, as HDMI connections will work with both
  * of those
  */
-static void intel_prepare_ddi_buffers(struct drm_device *dev,
-				      struct intel_digital_port *intel_dig_port)
+static void intel_prepare_ddi_buffers(struct drm_device *dev, enum port port,
+				      bool supports_hdmi)
 {
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	u32 reg;
-	int port = intel_dig_port->port;
 	int i, n_hdmi_entries, n_dp_entries, n_edp_entries, hdmi_default_entry,
 	    size;
 	int hdmi_level = dev_priv->vbt.ddi_port_info[port].hdmi_level_shift;
@@ -272,7 +271,7 @@ static void intel_prepare_ddi_buffers(struct drm_device *dev,
 	const struct ddi_buf_trans *ddi_translations;
 
 	if (IS_BROXTON(dev)) {
-		if (!intel_dig_port_supports_hdmi(intel_dig_port))
+		if (!supports_hdmi)
 			return;
 
 		/* Vswing programming for HDMI */
@@ -360,7 +359,7 @@ static void intel_prepare_ddi_buffers(struct drm_device *dev,
 		reg += 4;
 	}
 
-	if (!intel_dig_port_supports_hdmi(intel_dig_port))
+	if (!supports_hdmi)
 		return;
 
 	/* Choose a good default if VBT is badly populated */
@@ -380,18 +379,27 @@ static void intel_prepare_ddi_buffers(struct drm_device *dev,
  */
 void intel_prepare_ddi(struct drm_device *dev)
 {
-	struct intel_digital_port *intel_dig_port;
+	struct intel_encoder *intel_encoder;
 	bool visited[I915_MAX_PORTS] = { 0, };
 
 	if (!HAS_DDI(dev))
 		return;
 
-	for_each_digital_port(dev, intel_dig_port) {
-		if (visited[intel_dig_port->port])
+	for_each_intel_encoder(dev, intel_encoder) {
+		struct intel_digital_port *intel_dig_port;
+		enum port port;
+		bool supports_hdmi;
+
+		ddi_get_encoder_port(intel_encoder, &intel_dig_port, &port);
+
+		if (visited[port])
 			continue;
 
-		intel_prepare_ddi_buffers(dev, intel_dig_port);
-		visited[intel_dig_port->port] = true;
+		supports_hdmi = intel_dig_port &&
+				intel_dig_port_supports_hdmi(intel_dig_port);
+
+		intel_prepare_ddi_buffers(dev, port, supports_hdmi);
+		visited[port] = true;
 	}
 }
 
Signature · 1 line
2.1.0

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

maintainer
#8 lore raw

Re: [PATCH v2 2/2] drm/i915: fix intel_prepare_ddi

Quoted 14 lines · Damien Lespiau
Quoted 13 lines · Imre Deak

At the moment intel_prepare_ddi buffer will iterate through both MST and CRT encoders, which is incorrect. Neither of these encoder types have an embedding intel_digital_port object, so for these encoder types we will use random data when dereferencing the corresponding intel_digital_port->port field.

Introduced in
commit b403745c84592b26a0713e6944c2b109f6df5c82

Author: Damien Lespiau <[email protected]>
Date:   Mon Aug 4 22:01:33 2014 +0100

drm/i915: Iterate through the initialized DDIs to prepare their buffers

Quoted 8 lines
Quoted 6 lines

v2:
- fix getting at the port for MST encoders too
- make sure that intel_prepare_ddi_buffers() gets called for port E too (Paulo)

Both pushed to drm-intel-next-queued, with the Bugzilla: tag moved to 2/2 which actually fixes the bug. Thanks for the patches and review.

BR,
Jani.

Quoted 102 lines
Signature · 2 lines
-- 
Damien
Quoted 94 lines
---
 drivers/gpu/drm/i915/i915_drv.h  |  5 -----
 drivers/gpu/drm/i915/intel_ddi.c | 28 ++++++++++++++++++----------
 2 files changed, 18 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +0 -5
index 40ef672..c461b56 100644
@@ -251,11 +251,6 @@ enum hpd_pin {
 			    &dev->mode_config.connector_list,	\
 			    base.head)
 
-#define for_each_digital_port(dev, digital_port)		\
-	list_for_each_entry(digital_port,			\
-			    &dev->mode_config.encoder_list,	\
-			    base.base.head)
-
 #define for_each_encoder_on_crtc(dev, __crtc, intel_encoder) \
 	list_for_each_entry((intel_encoder), &(dev)->mode_config.encoder_list, base.head) \
 		if ((intel_encoder)->base.crtc == (__crtc))
drivers/gpu/drm/i915/intel_ddi.c +18 -10
index 903d395..9c1e74a 100644
@@ -256,12 +256,11 @@ intel_dig_port_supports_hdmi(const struct intel_digital_port *intel_dig_port)
  * in either FDI or DP modes only, as HDMI connections will work with both
  * of those
  */
-static void intel_prepare_ddi_buffers(struct drm_device *dev,
-				      struct intel_digital_port *intel_dig_port)
+static void intel_prepare_ddi_buffers(struct drm_device *dev, enum port port,
+				      bool supports_hdmi)
 {
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	u32 reg;
-	int port = intel_dig_port->port;
 	int i, n_hdmi_entries, n_dp_entries, n_edp_entries, hdmi_default_entry,
 	    size;
 	int hdmi_level = dev_priv->vbt.ddi_port_info[port].hdmi_level_shift;
@@ -272,7 +271,7 @@ static void intel_prepare_ddi_buffers(struct drm_device *dev,
 	const struct ddi_buf_trans *ddi_translations;
 
 	if (IS_BROXTON(dev)) {
-		if (!intel_dig_port_supports_hdmi(intel_dig_port))
+		if (!supports_hdmi)
 			return;
 
 		/* Vswing programming for HDMI */
@@ -360,7 +359,7 @@ static void intel_prepare_ddi_buffers(struct drm_device *dev,
 		reg += 4;
 	}
 
-	if (!intel_dig_port_supports_hdmi(intel_dig_port))
+	if (!supports_hdmi)
 		return;
 
 	/* Choose a good default if VBT is badly populated */
@@ -380,18 +379,27 @@ static void intel_prepare_ddi_buffers(struct drm_device *dev,
  */
 void intel_prepare_ddi(struct drm_device *dev)
 {
-	struct intel_digital_port *intel_dig_port;
+	struct intel_encoder *intel_encoder;
 	bool visited[I915_MAX_PORTS] = { 0, };
 
 	if (!HAS_DDI(dev))
 		return;
 
-	for_each_digital_port(dev, intel_dig_port) {
-		if (visited[intel_dig_port->port])
+	for_each_intel_encoder(dev, intel_encoder) {
+		struct intel_digital_port *intel_dig_port;
+		enum port port;
+		bool supports_hdmi;
+
+		ddi_get_encoder_port(intel_encoder, &intel_dig_port, &port);
+
+		if (visited[port])
 			continue;
 
-		intel_prepare_ddi_buffers(dev, intel_dig_port);
-		visited[intel_dig_port->port] = true;
+		supports_hdmi = intel_dig_port &&
+				intel_dig_port_supports_hdmi(intel_dig_port);
+
+		intel_prepare_ddi_buffers(dev, port, supports_hdmi);
+		visited[port] = true;
 	}
 }
 
Signature · 1 line
2.1.0

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

Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v2 1/2
#9 lore raw

Re: [PATCH v2 1/2] drm/i915: factor out ddi_get_encoder_port

In reply to Imre Deak
Quoted 8 lines · Imre Deak

In the next patch we'll need to get at both the encoder's intel_digital_port object - which maybe NULL for a CRT - and it's port, so factor out this functionality.

No functional change.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90067

Signature · 1 line
Damien
Quoted 60 lines
---
 drivers/gpu/drm/i915/intel_ddi.c | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +19 -9
index 455d44b..903d395 100644
@@ -210,29 +210,39 @@ static const struct bxt_ddi_buf_trans bxt_ddi_translations_hdmi[] = {
 	{ 154, 0x9A, 1, 128, true },	/* 9:	1200		0   */
 };
 
-enum port intel_ddi_get_encoder_port(struct intel_encoder *intel_encoder)
+static void ddi_get_encoder_port(struct intel_encoder *intel_encoder,
+				 struct intel_digital_port **dig_port,
+				 enum port *port)
 {
 	struct drm_encoder *encoder = &intel_encoder->base;
 	int type = intel_encoder->type;
 
 	if (type == INTEL_OUTPUT_DP_MST) {
-		struct intel_digital_port *intel_dig_port = enc_to_mst(encoder)->primary;
-		return intel_dig_port->port;
+		*dig_port = enc_to_mst(encoder)->primary;
+		*port = (*dig_port)->port;
 	} else if (type == INTEL_OUTPUT_DISPLAYPORT || type == INTEL_OUTPUT_EDP ||
 	    type == INTEL_OUTPUT_HDMI || type == INTEL_OUTPUT_UNKNOWN) {
-		struct intel_digital_port *intel_dig_port =
-			enc_to_dig_port(encoder);
-		return intel_dig_port->port;
-
+		*dig_port = enc_to_dig_port(encoder);
+		*port = (*dig_port)->port;
 	} else if (type == INTEL_OUTPUT_ANALOG) {
-		return PORT_E;
-
+		*dig_port = NULL;
+		*port = PORT_E;
 	} else {
 		DRM_ERROR("Invalid DDI encoder type %d\n", type);
 		BUG();
 	}
 }
 
+enum port intel_ddi_get_encoder_port(struct intel_encoder *intel_encoder)
+{
+	struct intel_digital_port *dig_port;
+	enum port port;
+
+	ddi_get_encoder_port(intel_encoder, &dig_port, &port);
+
+	return port;
+}
+
 static bool
 intel_dig_port_supports_hdmi(const struct intel_digital_port *intel_dig_port)
 {
Signature · 1 line
2.1.0

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

Tested-by on v1 1/1
#10 lore raw
In reply to Imre Deak

Task id: 6223 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied

PNV                                  276/276              276/276
ILK                                  301/301              301/301
SNB                                  318/318              318/318
IVB                                  345/345              345/345

BYT -1 285/285 284/285
BDW 321/321 321/321
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*BYT igt@kms_setmode@invalid-clone-exclusive-crtc PASS(5) DMESG_WARN(1)PASS(1)
(dmesg patch applied)drm:check_crtc_state[i915]]*ERROR*mismatch_in_has_infoframe(expected#,found#)@mismatch in has_infoframe .* found WARNING:at_drivers/gpu/drm/i915/intel_display.c:#check_crtc_state[i915]()@WARNING:.* at .* check_crtc_state+0x
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by on v1 1/1
#11 lore raw
In reply to Imre Deak
Quoted 6 lines · Imre Deak

We should check if a given encoder is of a digital type before casting it to a digital port object. This broke on HSW when iterating the VGA encoder.

Introduced in
commit b403745c84592b26a0713e6944c2b109f6df5c82

Quoted 7 lines
Author: Damien Lespiau <[email protected]>
Date:   Mon Aug 4 22:01:33 2014 +0100

drm/i915: Iterate through the initialized DDIs to prepare their buffers

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90067

Quoted 71 lines
---
 drivers/gpu/drm/i915/i915_drv.h  | 10 ++++++----
 drivers/gpu/drm/i915/intel_ddi.c |  3 ++-
 drivers/gpu/drm/i915/intel_drv.h | 10 ++++++++++
 3 files changed, 18 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +6 -4
index 40ef672..7160fc8 100644
@@ -251,10 +251,12 @@ enum hpd_pin {
 			    &dev->mode_config.connector_list,	\
 			    base.head)
 
-#define for_each_digital_port(dev, digital_port)		\
-	list_for_each_entry(digital_port,			\
-			    &dev->mode_config.encoder_list,	\
-			    base.base.head)
+#define for_each_digital_port(dev, __intel_encoder, digital_port)		\
+	list_for_each_entry(__intel_encoder,				\
+			    &dev->mode_config.encoder_list,		\
+			    base.head)					\
+		if (intel_enc_is_digital(__intel_encoder) &&		\
+		    ((digital_port) = enc_to_dig_port(&__intel_encoder->base)))
 
 #define for_each_encoder_on_crtc(dev, __crtc, intel_encoder) \
 	list_for_each_entry((intel_encoder), &(dev)->mode_config.encoder_list, base.head) \
drivers/gpu/drm/i915/intel_ddi.c +2 -1
index 455d44b..b5d7e74 100644
@@ -370,13 +370,14 @@ static void intel_prepare_ddi_buffers(struct drm_device *dev,
  */
 void intel_prepare_ddi(struct drm_device *dev)
 {
+	struct intel_encoder *__intel_encoder;
 	struct intel_digital_port *intel_dig_port;
 	bool visited[I915_MAX_PORTS] = { 0, };
 
 	if (!HAS_DDI(dev))
 		return;
 
-	for_each_digital_port(dev, intel_dig_port) {
+	for_each_digital_port(dev, __intel_encoder, intel_dig_port) {
 		if (visited[intel_dig_port->port])
 			continue;
 
drivers/gpu/drm/i915/intel_drv.h +10 -0
index 23a42a4..a354f26 100644
@@ -870,6 +870,16 @@ hdmi_to_dig_port(struct intel_hdmi *intel_hdmi)
 	return container_of(intel_hdmi, struct intel_digital_port, hdmi);
 }
 
+static inline bool intel_enc_is_digital(struct intel_encoder *intel_encoder)
+{
+	return	intel_encoder->type == INTEL_OUTPUT_HDMI ||
+		intel_encoder->type == INTEL_OUTPUT_DISPLAYPORT ||
+		intel_encoder->type == INTEL_OUTPUT_EDP ||
+		intel_encoder->type == INTEL_OUTPUT_UNKNOWN ||
+		intel_encoder->type == INTEL_OUTPUT_DP_MST;
+
+}
+
 /*
  * Returns the number of planes for this pipe, ie the number of sprites + 1
  * (primary plane). This doesn't count the cursor plane then.
Signature · 1 line
2.1.0

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

#12 lore raw
Quoted 10 lines · Damien Lespiau
Quoted 9 lines · Imre Deak

We should check if a given encoder is of a digital type before casting it to a digital port object. This broke on HSW when iterating the VGA encoder.

Introduced in
commit b403745c84592b26a0713e6944c2b109f6df5c82

Author: Damien Lespiau <[email protected]>
Date:   Mon Aug 4 22:01:33 2014 +0100
Quoted 6 lines
Quoted 4 lines

drm/i915: Iterate through the initialized DDIs to prepare their buffers

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90067

Huuum, scrap that r-b, I think we're missing PORT_E initialization on HSW, because that's the one driver the CRT encoder through FDI.

Signature · 5 lines
Damien
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#13 lore raw
Quoted 13 lines · Damien Lespiau
Quoted 12 lines · Damien Lespiau
Quoted 11 lines · Imre Deak

We should check if a given encoder is of a digital type before casting it to a digital port object. This broke on HSW when iterating the VGA encoder.

Introduced in
commit b403745c84592b26a0713e6944c2b109f6df5c82

Author: Damien Lespiau <[email protected]>
Date:   Mon Aug 4 22:01:33 2014 +0100

drm/i915: Iterate through the initialized DDIs to prepare their buffers

Quoted 7 lines
Quoted 4 lines
Quoted 2 lines

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90067

Huuum, scrap that r-b, I think we're missing PORT_E initialization on HSW, because that's the one driver the CRT encoder through FDI.

Which is exactly what Paulo found as well... Did we already mentionned how hard is was to follow reviews :)

Signature · 5 lines
Damien
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx