Skip to contentSkip to conversation

drm: add drm_mode_cea_vic

PATCH Applied Paulo Zanoni 3 participants 5 messages Nov 23, 2012 – Nov 26, 2012

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

PATCH 1/2 drm: add drm_mode_cea_vic

From: Paulo Zanoni <[email protected]>

This function returns the VIC of the mode. This value can be used when creating AVI InfoFrames.

Cc: Thierry Reding <[email protected]>
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=50371

---
 drivers/gpu/drm/drm_edid.c |   19 +++++++++++++++++++
 include/drm/drm_crtc.h     |    1 +
 2 files changed, 20 insertions(+)

Since drm-intel-next-queued is too old for this patch, I am rebasing it against drm-next and splitting into 2 patches: one drm-only and the other i915-only, so I imagine the first will be merged by Dave and the second by Daniel.

New version:
- Based on Dave's drm-next
- Fix function name inside the comments
- Remove the i915 chunk
- Constification of other functions is no more required as they are already const here.

drivers/gpu/drm/drm_edid.c +19 -0
index 1648200..011bd4f 100644
@@ -2079,3 +2079,22 @@ int drm_add_modes_noedid(struct drm_connector *connector,
 	return num_modes;
 }
 EXPORT_SYMBOL(drm_add_modes_noedid);
+
+/**
+ * drm_mode_cea_vic - return the CEA-861 VIC of a given mode
+ * @mode: mode
+ *
+ * RETURNS:
+ * The VIC number, 0 in case it's not a CEA-861 mode.
+ */
+uint8_t drm_mode_cea_vic(const struct drm_display_mode *mode)
+{
+	uint8_t i;
+
+	for (i = 0; i < drm_num_cea_modes; i++)
+		if (drm_mode_equal(mode, &edid_cea_modes[i]))
+			return i + 1;
+
+	return 0;
+}
+EXPORT_SYMBOL(drm_mode_cea_vic);
include/drm/drm_crtc.h +1 -0
index c0635b7..3538eda 100644
@@ -1055,6 +1055,7 @@ extern struct drm_display_mode *drm_gtf_mode_complex(struct drm_device *dev,
 				int GTF_2C, int GTF_K, int GTF_2J);
 extern int drm_add_modes_noedid(struct drm_connector *connector,
 				int hdisplay, int vdisplay);
+extern uint8_t drm_mode_cea_vic(const struct drm_display_mode *mode);
 
 extern int drm_edid_header_is_valid(const u8 *raw_edid);
 extern bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid);
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 2/2 drm/i915: set the VIC of the mode on the AVI InfoFrame

From: Paulo Zanoni <[email protected]>

We currently set "0" as the VIC value of the AVI InfoFrames. According to the specs this should be fine and work for every mode, so to my point of view we can't consider the current behavior as a bug. The problem is that we recently received a bug report (Kernel bug #50371) from a user that has an AV receiver that gives a black screen for any mode with VIC set to 0.

So in order to make at least some modes work for him, this patch sets the correct VIC number when sending AVI InfoFrames.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=50371

---
 drivers/gpu/drm/i915/intel_hdmi.c |    2 ++
 1 file changed, 2 insertions(+)
drivers/gpu/drm/i915/intel_hdmi.c +2 -0
index 1dcfd5b..eaf70d6 100644
@@ -340,6 +340,8 @@ static void intel_hdmi_set_avi_infoframe(struct drm_encoder *encoder,
 	if (adjusted_mode->flags & DRM_MODE_FLAG_DBLCLK)
 		avi_if.body.avi.YQ_CN_PR |= DIP_AVI_PR_2;
 
+	avi_if.body.avi.VIC = drm_mode_cea_vic(adjusted_mode);
+
 	intel_set_infoframe(encoder, &avi_if);
 }
 
Signature · 1 line
1.7.10.4
Reviewed-by on v1 1/2
#3 lore raw
In reply to Paulo Zanoni
Quoted 17 lines · Paulo Zanoni

From: Paulo Zanoni <[email protected]>

This function returns the VIC of the mode. This value can be used when creating AVI InfoFrames.

Cc: Thierry Reding <[email protected]>
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=50371

---
 drivers/gpu/drm/drm_edid.c |   19 +++++++++++++++++++
 include/drm/drm_crtc.h     |    1 +
 2 files changed, 20 insertions(+)

Since drm-intel-next-queued is too old for this patch, I am rebasing it against drm-next and splitting into 2 patches: one drm-only and the other i915-only, so I imagine the first will be merged by Dave and the second by Daniel.

Quoted 6 lines

New version:
- Based on Dave's drm-next
- Fix function name inside the comments
- Remove the i915 chunk
- Constification of other functions is no more required as they are already const here.

Looks good to me:

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

#4 lore raw
Quoted 25 lines · Thierry Reding
Quoted 17 lines · Paulo Zanoni

From: Paulo Zanoni <[email protected]>

This function returns the VIC of the mode. This value can be used when creating AVI InfoFrames.

Cc: Thierry Reding <[email protected]>
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=50371

---
 drivers/gpu/drm/drm_edid.c |   19 +++++++++++++++++++
 include/drm/drm_crtc.h     |    1 +
 2 files changed, 20 insertions(+)

Since drm-intel-next-queued is too old for this patch, I am rebasing it against drm-next and splitting into 2 patches: one drm-only and the other i915-only, so I imagine the first will be merged by Dave and the second by Daniel.

Quoted 6 lines

New version:
- Based on Dave's drm-next
- Fix function name inside the comments
- Remove the i915 chunk
- Constification of other functions is no more required as they are already const here.

Quoted 3 lines

Looks good to me:

Merged to drm-intel-next for 3.8 with Dave's irc-ack. -Daniel

Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
#2 lore raw

Re: [PATCH 2/2] drm/i915: set the VIC of the mode on the AVI InfoFrame

In reply to Paulo Zanoni
Quoted 9 lines · Paulo Zanoni

From: Paulo Zanoni <[email protected]>

We currently set "0" as the VIC value of the AVI InfoFrames. According to the specs this should be fine and work for every mode, so to my point of view we can't consider the current behavior as a bug. The problem is that we recently received a bug report (Kernel bug #50371) from a user that has an AV receiver that gives a black screen for any mode with VIC set to 0.

Quoted 5 lines

So in order to make at least some modes work for him, this patch sets the correct VIC number when sending AVI InfoFrames.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=50371

Queued for -next, thanks for the patch.
-Daniel

Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch