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

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

video/hdmi: Rename HDMI_IDENTIFIER to HDMI_IEEE_OUI 

HDMI_IDENTIFIER was felt too generic, rename it to what it is, the IEEE
OUI corresponding to HDMI Licensing, LLC.

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



Cc: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Reviewed-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarDave Airlie <airlied@gmail.com>
parent c8bb75af

drivers/gpu/drm/drm_edid.c

+1 −1
Original line number Diff line number Diff line
@@ -2655,7 +2655,7 @@ static bool cea_db_is_hdmi_vsdb(const u8 *db) 


	hdmi_id = db[1] | (db[2] << 8) | (db[3] << 16);



	return hdmi_id == HDMI_IDENTIFIER;

	return hdmi_id == HDMI_IEEE_OUI;

}



#define for_each_cea_db(cea, i, start, end) \

drivers/video/hdmi.c

+2 −2
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ int hdmi_vendor_infoframe_init(struct hdmi_vendor_infoframe *frame) 
	frame->type = HDMI_INFOFRAME_TYPE_VENDOR;

	frame->version = 1;



	frame->oui = HDMI_IDENTIFIER;

	frame->oui = HDMI_IEEE_OUI;



	/*

	 * 0 is a valid value for s3d_struct, so we use a special "not set"
@@ -387,7 +387,7 @@ hdmi_vendor_any_infoframe_pack(union hdmi_vendor_any_infoframe *frame, 
			   void *buffer, size_t size)

{

	/* we only know about HDMI vendor infoframes */

	if (frame->any.oui != HDMI_IDENTIFIER)

	if (frame->any.oui != HDMI_IEEE_OUI)

		return -EINVAL;



	return hdmi_vendor_infoframe_pack(&frame->hdmi, buffer, size);

include/linux/hdmi.h

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

};



#define HDMI_IDENTIFIER 0x000c03

#define HDMI_IEEE_OUI 0x000c03

#define HDMI_INFOFRAME_HEADER_SIZE  4

#define HDMI_AVI_INFOFRAME_SIZE    13

#define HDMI_SPD_INFOFRAME_SIZE    25