Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c782d2e7 authored by Lespiau, Damien's avatar Lespiau, Damien Committed by Dave Airlie
Browse files

drm/edid: Move HDMI_IDENTIFIER to hdmi.h 



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: default avatarDamien Lespiau <damien.lespiau@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarDave Airlie <airlied@gmail.com>
parent a26a58e8

drivers/gpu/drm/drm_edid.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -2317,7 +2317,6 @@ add_detailed_modes(struct drm_connector *connector, struct edid *edid, 
	return closure.modes;

	return closure.modes;

}

}





#define HDMI_IDENTIFIER 0x000C03

#define AUDIO_BLOCK	0x01

#define AUDIO_BLOCK	0x01

#define VIDEO_BLOCK     0x02

#define VIDEO_BLOCK     0x02

#define VENDOR_BLOCK    0x03

#define VENDOR_BLOCK    0x03

include/linux/hdmi.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ enum hdmi_infoframe_type { 
	HDMI_INFOFRAME_TYPE_AUDIO = 0x84,

	HDMI_INFOFRAME_TYPE_AUDIO = 0x84,

};

};





#define HDMI_IDENTIFIER 0x000c03

#define HDMI_INFOFRAME_HEADER_SIZE  4

#define HDMI_INFOFRAME_HEADER_SIZE  4

#define HDMI_AVI_INFOFRAME_SIZE    13

#define HDMI_AVI_INFOFRAME_SIZE    13

#define HDMI_SPD_INFOFRAME_SIZE    25

#define HDMI_SPD_INFOFRAME_SIZE    25