Skip to contentSkip to conversation

drm/i915: implement hsw_write_infoframe

PATCH In review Paulo Zanoni 3 participants 5 messages May 11, 2012 – May 13, 2012

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 drm/i915: implement hsw_write_infoframe

From: Paulo Zanoni <[email protected]>

Both the control and data registers are completely different now.

---
 drivers/gpu/drm/i915/i915_reg.h   |    4 +++
 drivers/gpu/drm/i915/intel_hdmi.c |   68 +++++++++++++++++++++++++++++++++----
 2 files changed, 66 insertions(+), 6 deletions(-)

Things are simpler and easier now.

drivers/gpu/drm/i915/i915_reg.h +4 -0
index fb76b19..2d49b95 100644
@@ -1697,6 +1697,7 @@
 /* Video Data Island Packet control */
 #define VIDEO_DIP_DATA		0x61178
 #define VIDEO_DIP_CTL		0x61170
+/* Pre HSW: */
 #define   VIDEO_DIP_ENABLE		(1 << 31)
 #define   VIDEO_DIP_PORT_B		(1 << 29)
 #define   VIDEO_DIP_PORT_C		(2 << 29)
@@ -1713,6 +1714,9 @@
 #define   VIDEO_DIP_FREQ_VSYNC		(1 << 16)
 #define   VIDEO_DIP_FREQ_2VSYNC		(2 << 16)
 #define   VIDEO_DIP_FREQ_MASK		(3 << 16)
+/* HSW and later: */
+#define   VIDEO_DIP_ENABLE_AVI_HSW	(1 << 12)
+#define   VIDEO_DIP_ENABLE_SPD_HSW	(1 << 0)
 
 /* Panel power sequencing */
 #define PP_STATUS	0x61200
drivers/gpu/drm/i915/intel_hdmi.c +62 -6

83 lines not on this page · raw message

Signature · 1 line
1.7.10
#1 lore raw

PATCH 2/2 drm/i915: small hdmi coding style cleanups

From: Paulo Zanoni <[email protected]>

- Changed the coding style of auxiliary infoframe functions to make them smaller
- Fixed the column alignment of some function definitions
- Remove definition of "struct drm_crtc" in some places as they're used only to retrieve "struct intel_crtc"

---
 drivers/gpu/drm/i915/intel_hdmi.c |   71 +++++++++++--------------------------
 1 file changed, 20 insertions(+), 51 deletions(-)

Non-important auxiliary functions don't deserve to fill the whole screen.

drivers/gpu/drm/i915/intel_hdmi.c +20 -51
index ed91db0..e996994 100644
@@ -65,78 +65,54 @@ void intel_dip_infoframe_csum(struct dip_infoframe *frame)
 
 static u32 g4x_infoframe_index(struct dip_infoframe *frame)
 {
-	u32 flags = 0;
-
 	switch (frame->type) {
 	case DIP_TYPE_AVI:
-		flags |= VIDEO_DIP_SELECT_AVI;
-		break;
+		return VIDEO_DIP_SELECT_AVI;
 	case DIP_TYPE_SPD:
-		flags |= VIDEO_DIP_SELECT_SPD;
-		break;
+		return VIDEO_DIP_SELECT_SPD;
 	default:
 		DRM_DEBUG_DRIVER("unknown info frame type %d\n", frame->type);
-		break;
+		return 0;
 	}
-
-	return flags;
 }
 
 static u32 g4x_infoframe_enable(struct dip_infoframe *frame)
 {
-	u32 flags = 0;
-
 	switch (frame->type) {
 	case DIP_TYPE_AVI:
-		flags |= VIDEO_DIP_ENABLE_AVI;
-		break;
+		return VIDEO_DIP_ENABLE_AVI;
 	case DIP_TYPE_SPD:
-		flags |= VIDEO_DIP_ENABLE_SPD;
-		break;
+		return VIDEO_DIP_ENABLE_SPD;
 	default:
 		DRM_DEBUG_DRIVER("unknown info frame type %d\n", frame->type);
-		break;
+		return 0;
 	}
-
-	return flags;
 }
 
 static u32 hsw_infoframe_enable(struct dip_infoframe *frame)
 {
-	u32 flags = 0;
-
 	switch (frame->type) {
 	case DIP_TYPE_AVI:
-		flags |= VIDEO_DIP_ENABLE_AVI_HSW;
-		break;
+		return VIDEO_DIP_ENABLE_AVI_HSW;
 	case DIP_TYPE_SPD:
-		flags |= VIDEO_DIP_ENABLE_SPD_HSW;
-		break;
+		return VIDEO_DIP_ENABLE_SPD_HSW;
 	default:
 		DRM_DEBUG_DRIVER("unknown info frame type %d\n", frame->type);
-		break;
+		return 0;
 	}
-
-	return flags;
 }
 
 static u32 hsw_infoframe_data_reg(struct dip_infoframe *frame, enum pipe pipe)
 {
-	u32 reg = 0;
-
 	switch (frame->type) {
 	case DIP_TYPE_AVI:
-		reg = HSW_TVIDEO_DIP_AVI_DATA(pipe);
-		break;
+		return HSW_TVIDEO_DIP_AVI_DATA(pipe);
 	case DIP_TYPE_SPD:
-		reg = HSW_TVIDEO_DIP_SPD_DATA(pipe);
-		break;
+		return HSW_TVIDEO_DIP_SPD_DATA(pipe);
 	default:
 		DRM_DEBUG_DRIVER("unknown info frame type %d\n", frame->type);
-		break;
+		return 0;
 	}
-
-	return reg;
 }
 
 static void g4x_write_infoframe(struct drm_encoder *encoder,
@@ -149,8 +125,6 @@ static void g4x_write_infoframe(struct drm_encoder *encoder,
 	u32 val = I915_READ(VIDEO_DIP_CTL);
 	unsigned i, len = DIP_HEADER_SIZE + frame->len;
 
-
-	/* XXX first guess at handling video port, is this corrent? */
 	val &= ~VIDEO_DIP_PORT_MASK;
 	if (intel_hdmi->sdvox_reg == SDVOB)
 		val |= VIDEO_DIP_PORT_B;
@@ -185,8 +159,7 @@ static void ibx_write_infoframe(struct drm_encoder *encoder,
 	uint32_t *data = (uint32_t *)frame;
 	struct drm_device *dev = encoder->dev;
 	struct drm_i915_private *dev_priv = dev->dev_private;
-	struct drm_crtc *crtc = encoder->crtc;
-	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+	struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
 	struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
 	int reg = TVIDEO_DIP_CTL(intel_crtc->pipe);
 	unsigned i, len = DIP_HEADER_SIZE + frame->len;
@@ -235,8 +208,7 @@ static void cpt_write_infoframe(struct drm_encoder *encoder,
 	uint32_t *data = (uint32_t *)frame;
 	struct drm_device *dev = encoder->dev;
 	struct drm_i915_private *dev_priv = dev->dev_private;
-	struct drm_crtc *crtc = encoder->crtc;
-	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+	struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
 	int reg = TVIDEO_DIP_CTL(intel_crtc->pipe);
 	unsigned i, len = DIP_HEADER_SIZE + frame->len;
 	u32 val = I915_READ(reg);
@@ -270,13 +242,12 @@ static void cpt_write_infoframe(struct drm_encoder *encoder,
 }
 
 static void vlv_write_infoframe(struct drm_encoder *encoder,
-				     struct dip_infoframe *frame)
+				struct dip_infoframe *frame)
 {
 	uint32_t *data = (uint32_t *)frame;
 	struct drm_device *dev = encoder->dev;
 	struct drm_i915_private *dev_priv = dev->dev_private;
-	struct drm_crtc *crtc = encoder->crtc;
-	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+	struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
 	int reg = VLV_TVIDEO_DIP_CTL(intel_crtc->pipe);
 	unsigned i, len = DIP_HEADER_SIZE + frame->len;
 	u32 val = I915_READ(reg);
@@ -309,8 +280,7 @@ static void hsw_write_infoframe(struct drm_encoder *encoder,
 	uint32_t *data = (uint32_t *)frame;
 	struct drm_device *dev = encoder->dev;
 	struct drm_i915_private *dev_priv = dev->dev_private;
-	struct drm_crtc *crtc = encoder->crtc;
-	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+	struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
 	u32 ctl_reg = HSW_TVIDEO_DIP_CTL(intel_crtc->pipe);
 	u32 data_reg = hsw_infoframe_data_reg(frame, intel_crtc->pipe);
 	unsigned int i, len = DIP_HEADER_SIZE + frame->len;
@@ -381,8 +351,7 @@ static void intel_hdmi_mode_set(struct drm_encoder *encoder,
 {
 	struct drm_device *dev = encoder->dev;
 	struct drm_i915_private *dev_priv = dev->dev_private;
-	struct drm_crtc *crtc = encoder->crtc;
-	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+	struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
 	struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
 	u32 sdvox;
 
@@ -556,8 +525,8 @@ intel_hdmi_detect_audio(struct drm_connector *connector)
 
 static int
 intel_hdmi_set_property(struct drm_connector *connector,
-		      struct drm_property *property,
-		      uint64_t val)
+			struct drm_property *property,
+			uint64_t val)
 {
 	struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
 	struct drm_i915_private *dev_priv = connector->dev->dev_private;
Signature · 1 line
1.7.10
Reviewed-by on v1 1/2
#3 lore raw
In reply to Paulo Zanoni
Quoted 5 lines · Paulo Zanoni

From: Paulo Zanoni<[email protected]>

Both the control and data registers are completely different now.

Haswell for the win! :)

Just some comments below, but nothing too critical.

Quoted 7 lines
drivers/gpu/drm/i915/intel_hdmi.c +7 -0
+static u32 hsw_infoframe_enable(struct dip_infoframe *frame)
+{
+	u32 flags = 0;
+
+	switch (frame->type) {
+	case DIP_TYPE_AVI:
+		flags |= VIDEO_DIP_ENABLE_AVI_HSW;

drivers/gpu/drm/i915/intel_hdmi.c static u32 g4x_infoframe_enable(struct dip_infoframe *frame) · line 120

Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +10 -0
+		break;
+	case DIP_TYPE_SPD:
+		flags |= VIDEO_DIP_ENABLE_SPD_HSW;
+		break;
+	default:
+		DRM_DEBUG_DRIVER("unknown info frame type %d\n", frame->type);
+		break;
+	}
+
+	return flags;

I think it makes sense to inverse order of patches, and simplify the _infoframe stuff you do in your 2nd patch first; and then add this part with new style directly.

And I think it would be worth adding a comment with TODO saying that we still need to support other frames (GCP, VSC and so on). We don't have any use for them right now, but in the future we might. And we have all the registers defined already anyway.

Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +10 -0
+}
+
+static u32 hsw_infoframe_data_reg(struct dip_infoframe *frame, enum pipe pipe)
+{
+	u32 reg = 0;
+
+	switch (frame->type) {
+	case DIP_TYPE_AVI:
+		reg = HSW_TVIDEO_DIP_AVI_DATA(pipe);
+		break;

drivers/gpu/drm/i915/intel_hdmi.c static u32 g4x_infoframe_enable(struct dip_infoframe *frame) · line 140

Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +10 -0
+	case DIP_TYPE_SPD:
+		reg = HSW_TVIDEO_DIP_SPD_DATA(pipe);
+		break;
+	default:
+		DRM_DEBUG_DRIVER("unknown info frame type %d\n", frame->type);
+		break;
+	}
+
+	return reg;
+}

I think you could simplify it here as well, similarly to what you do in your 2nd patch, and return the register directly.

drivers/gpu/drm/i915/intel_hdmi.c static void vlv_write_infoframe(struct drm_encoder *encoder, · line 307

Quoted 3 lines

static void hsw_write_infoframe(struct drm_encoder *encoder,

drivers/gpu/drm/i915/intel_hdmi.c +1 -1
-				     struct dip_infoframe *frame)
+				struct dip_infoframe *frame)

I think this should go into the other patch (which simplifies tabbing and such), no?

But other than that, very nice!

Reviewed-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] drm/i915: small hdmi coding style cleanups

In reply to Paulo Zanoni
Quoted 9 lines · Paulo Zanoni

From: Paulo Zanoni<[email protected]>

- Changed the coding style of auxiliary infoframe functions to make them smaller
- Fixed the column alignment of some function definitions
- Remove definition of "struct drm_crtc" in some places as they're used only to retrieve "struct intel_crtc"

Except for the comments I had on the other patch:

#4 lore raw
In reply to Eugeni Dodonov
Quoted 10 lines · Eugeni Dodonov
Quoted 5 lines · Paulo Zanoni

From: Paulo Zanoni<[email protected]>

Both the control and data registers are completely different now.

Haswell for the win! :)

Just some comments below, but nothing too critical.

I kinda agree with Eugeni's bikesheds - fixing up style issues in the new code right away sounds better.
-Daniel

Quoted 66 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_hdmi.c +7 -0
+static u32 hsw_infoframe_enable(struct dip_infoframe *frame)
+{
+	u32 flags = 0;
+
+	switch (frame->type) {
+	case DIP_TYPE_AVI:
+		flags |= VIDEO_DIP_ENABLE_AVI_HSW;

drivers/gpu/drm/i915/intel_hdmi.c static u32 g4x_infoframe_enable(struct dip_infoframe *frame) · line 120

Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +10 -0
+		break;
+	case DIP_TYPE_SPD:
+		flags |= VIDEO_DIP_ENABLE_SPD_HSW;
+		break;
+	default:
+		DRM_DEBUG_DRIVER("unknown info frame type %d\n", frame->type);
+		break;
+	}
+
+	return flags;

I think it makes sense to inverse order of patches, and simplify the _infoframe stuff you do in your 2nd patch first; and then add this part with new style directly.

And I think it would be worth adding a comment with TODO saying that we still need to support other frames (GCP, VSC and so on). We don't have any use for them right now, but in the future we might. And we have all the registers defined already anyway.

Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +10 -0
+}
+
+static u32 hsw_infoframe_data_reg(struct dip_infoframe *frame, enum pipe pipe)
+{
+	u32 reg = 0;
+
+	switch (frame->type) {
+	case DIP_TYPE_AVI:
+		reg = HSW_TVIDEO_DIP_AVI_DATA(pipe);
+		break;

drivers/gpu/drm/i915/intel_hdmi.c static u32 g4x_infoframe_enable(struct dip_infoframe *frame) · line 140

Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +10 -0
+	case DIP_TYPE_SPD:
+		reg = HSW_TVIDEO_DIP_SPD_DATA(pipe);
+		break;
+	default:
+		DRM_DEBUG_DRIVER("unknown info frame type %d\n", frame->type);
+		break;
+	}
+
+	return reg;
+}

I think you could simplify it here as well, similarly to what you do in your 2nd patch, and return the register directly.

drivers/gpu/drm/i915/intel_hdmi.c static void vlv_write_infoframe(struct drm_encoder *encoder, · line 307

Quoted 3 lines

static void hsw_write_infoframe(struct drm_encoder *encoder,

drivers/gpu/drm/i915/intel_hdmi.c +1 -1
-				     struct dip_infoframe *frame)
+				struct dip_infoframe *frame)

I think this should go into the other patch (which simplifies tabbing and such), no?

But other than that, very nice!

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

Signature · 3 lines
Daniel Vetter
Mail: [email protected]
Mobile: +41 (0)79 365 57 48