diff mbox

[09/12] drm/edid: Move HDMI_IDENTIFIER to hdmi.h

Message ID 1376500755-30227-10-git-send-email-damien.lespiau@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Lespiau, Damien Aug. 14, 2013, 5:19 p.m. UTC 
We'll need the HDMI OUI for the HDMI vendor infoframe data, so let's
move the DRM one to hdmi.h, might as well use the hdmi header to store
some hdmi defines.

(Note that, in fact, infoframes are part of the CEA-861 standard, and
only the HDMI vendor specific infoframe is special to HDMI, but
details..)

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/drm_edid.c | 1 -
 include/linux/hdmi.h       | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

Comments

Thierry Reding Aug. 15, 2013, 3:12 p.m. UTC | #1 
On Wed, Aug 14, 2013 at 06:19:12PM +0100, Damien Lespiau wrote:
[...]
> +#define HDMI_IDENTIFIER 0x000c03

HDMI_IDENTIFIER sounds really generic. Perhaps HDMI_INFOFRAME_OUI_HDMI?

Thierry
Lespiau, Damien Aug. 19, 2013, 1:49 p.m. UTC | #2 
On Thu, Aug 15, 2013 at 05:12:00PM +0200, Thierry Reding wrote:
> On Wed, Aug 14, 2013 at 06:19:12PM +0100, Damien Lespiau wrote:
> [...]
> > +#define HDMI_IDENTIFIER 0x000c03
> 
> HDMI_IDENTIFIER sounds really generic. Perhaps HDMI_INFOFRAME_OUI_HDMI?

This identifier is not infoframe specific, it's the IEEE OUI:

  http://standards.ieee.org/develop/regauth/oui/oui.txt

would HDMI_IEEE_OUI suit you?
Thierry Reding Aug. 19, 2013, 7:31 p.m. UTC | #3 
On Mon, Aug 19, 2013 at 02:49:50PM +0100, Damien Lespiau wrote:
> On Thu, Aug 15, 2013 at 05:12:00PM +0200, Thierry Reding wrote:
> > On Wed, Aug 14, 2013 at 06:19:12PM +0100, Damien Lespiau wrote:
> > [...]
> > > +#define HDMI_IDENTIFIER 0x000c03
> > 
> > HDMI_IDENTIFIER sounds really generic. Perhaps HDMI_INFOFRAME_OUI_HDMI?
> 
> This identifier is not infoframe specific, it's the IEEE OUI:
> 
>   http://standards.ieee.org/develop/regauth/oui/oui.txt
> 
> would HDMI_IEEE_OUI suit you?

Yes, that sounds much better. Or perhaps IEEE_OUI_HDMI? From a quick
grep through the kernel code using the OUI as a prefix seems to be
slightly more common. If we ever end up adding a header to collect
OUIs it'd be useful to namespace them somehow.

Thierry
Lespiau, Damien Aug. 21, 2013, 5:16 p.m. UTC | #4 
On Mon, Aug 19, 2013 at 09:31:42PM +0200, Thierry Reding wrote:
> On Mon, Aug 19, 2013 at 02:49:50PM +0100, Damien Lespiau wrote:
> > On Thu, Aug 15, 2013 at 05:12:00PM +0200, Thierry Reding wrote:
> > > On Wed, Aug 14, 2013 at 06:19:12PM +0100, Damien Lespiau wrote:
> > > [...]
> > > > +#define HDMI_IDENTIFIER 0x000c03
> > > 
> > > HDMI_IDENTIFIER sounds really generic. Perhaps HDMI_INFOFRAME_OUI_HDMI?
> > 
> > This identifier is not infoframe specific, it's the IEEE OUI:
> > 
> >   http://standards.ieee.org/develop/regauth/oui/oui.txt
> > 
> > would HDMI_IEEE_OUI suit you?
> 
> Yes, that sounds much better. Or perhaps IEEE_OUI_HDMI? From a quick
> grep through the kernel code using the OUI as a prefix seems to be
> slightly more common. If we ever end up adding a header to collect
> OUIs it'd be useful to namespace them somehow.

Hopefully we can agree that HDMI_IEEE_OUI is fine :) Would you mind
having a look at the two patches introduced to address your comments

  HDMI 4k support v4
  http://lists.freedesktop.org/archives/dri-devel/2013-August/043988.html

Patches 11 and 14.

Thanks,
diff mbox

Patch

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index d76d608..3aa653f 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -2317,7 +2317,6 @@  add_detailed_modes(struct drm_connector *connector, struct edid *edid,
 	return closure.modes;
 }
 
-#define HDMI_IDENTIFIER 0x000C03
 #define AUDIO_BLOCK	0x01
 #define VIDEO_BLOCK     0x02
 #define VENDOR_BLOCK    0x03
diff --git a/include/linux/hdmi.h b/include/linux/hdmi.h
index e733252..37e0cd7 100644
--- a/include/linux/hdmi.h
+++ b/include/linux/hdmi.h
@@ -18,6 +18,7 @@  enum hdmi_infoframe_type {
 	HDMI_INFOFRAME_TYPE_AUDIO = 0x84,
 };
 
+#define HDMI_IDENTIFIER 0x000c03
 #define HDMI_INFOFRAME_HEADER_SIZE  4
 #define HDMI_AVI_INFOFRAME_SIZE    13
 #define HDMI_SPD_INFOFRAME_SIZE    25