Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Dave Airlie <airlied@gmail.com>

authored by

Lespiau, Damien and committed by
Dave Airlie
6cb3b7f1 c8bb75af

+4 -4
+1 -1
drivers/gpu/drm/drm_edid.c
··· 2655 2655 2656 2656 hdmi_id = db[1] | (db[2] << 8) | (db[3] << 16); 2657 2657 2658 - return hdmi_id == HDMI_IDENTIFIER; 2658 + return hdmi_id == HDMI_IEEE_OUI; 2659 2659 } 2660 2660 2661 2661 #define for_each_cea_db(cea, i, start, end) \
+2 -2
drivers/video/hdmi.c
··· 300 300 frame->type = HDMI_INFOFRAME_TYPE_VENDOR; 301 301 frame->version = 1; 302 302 303 - frame->oui = HDMI_IDENTIFIER; 303 + frame->oui = HDMI_IEEE_OUI; 304 304 305 305 /* 306 306 * 0 is a valid value for s3d_struct, so we use a special "not set" ··· 387 387 void *buffer, size_t size) 388 388 { 389 389 /* we only know about HDMI vendor infoframes */ 390 - if (frame->any.oui != HDMI_IDENTIFIER) 390 + if (frame->any.oui != HDMI_IEEE_OUI) 391 391 return -EINVAL; 392 392 393 393 return hdmi_vendor_infoframe_pack(&frame->hdmi, buffer, size);
+1 -1
include/linux/hdmi.h
··· 18 18 HDMI_INFOFRAME_TYPE_AUDIO = 0x84, 19 19 }; 20 20 21 - #define HDMI_IDENTIFIER 0x000c03 21 + #define HDMI_IEEE_OUI 0x000c03 22 22 #define HDMI_INFOFRAME_HEADER_SIZE 4 23 23 #define HDMI_AVI_INFOFRAME_SIZE 13 24 24 #define HDMI_SPD_INFOFRAME_SIZE 25