diff options
author | Lespiau, Damien <damien.lespiau@intel.com> | 2013-08-19 11:59:05 -0400 |
---|---|---|
committer | Dave Airlie <airlied@gmail.com> | 2013-08-29 18:42:01 -0400 |
commit | 6cb3b7f1c013fd4bea41e16ee557bcb2f1561787 (patch) | |
tree | 7e4fd75076a3704c90614324f2e9c9054d789caf | |
parent | c8bb75afff8eaed89476a00f733c666e1b44115b (diff) |
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>
-rw-r--r-- | drivers/gpu/drm/drm_edid.c | 2 | ||||
-rw-r--r-- | drivers/video/hdmi.c | 4 | ||||
-rw-r--r-- | include/linux/hdmi.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index ed3505fe8ace..a207cc3f2c57 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c | |||
@@ -2655,7 +2655,7 @@ static bool cea_db_is_hdmi_vsdb(const u8 *db) | |||
2655 | 2655 | ||
2656 | hdmi_id = db[1] | (db[2] << 8) | (db[3] << 16); | 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 | #define for_each_cea_db(cea, i, start, end) \ | 2661 | #define for_each_cea_db(cea, i, start, end) \ |
diff --git a/drivers/video/hdmi.c b/drivers/video/hdmi.c index 4f73167c8647..9e758a8f890d 100644 --- a/drivers/video/hdmi.c +++ b/drivers/video/hdmi.c | |||
@@ -300,7 +300,7 @@ int hdmi_vendor_infoframe_init(struct hdmi_vendor_infoframe *frame) | |||
300 | frame->type = HDMI_INFOFRAME_TYPE_VENDOR; | 300 | frame->type = HDMI_INFOFRAME_TYPE_VENDOR; |
301 | frame->version = 1; | 301 | frame->version = 1; |
302 | 302 | ||
303 | frame->oui = HDMI_IDENTIFIER; | 303 | frame->oui = HDMI_IEEE_OUI; |
304 | 304 | ||
305 | /* | 305 | /* |
306 | * 0 is a valid value for s3d_struct, so we use a special "not set" | 306 | * 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, | |||
387 | void *buffer, size_t size) | 387 | void *buffer, size_t size) |
388 | { | 388 | { |
389 | /* we only know about HDMI vendor infoframes */ | 389 | /* we only know about HDMI vendor infoframes */ |
390 | if (frame->any.oui != HDMI_IDENTIFIER) | 390 | if (frame->any.oui != HDMI_IEEE_OUI) |
391 | return -EINVAL; | 391 | return -EINVAL; |
392 | 392 | ||
393 | return hdmi_vendor_infoframe_pack(&frame->hdmi, buffer, size); | 393 | return hdmi_vendor_infoframe_pack(&frame->hdmi, buffer, size); |
diff --git a/include/linux/hdmi.h b/include/linux/hdmi.h index d4ae12c7931b..9231be9e90a2 100644 --- a/include/linux/hdmi.h +++ b/include/linux/hdmi.h | |||
@@ -18,7 +18,7 @@ enum hdmi_infoframe_type { | |||
18 | HDMI_INFOFRAME_TYPE_AUDIO = 0x84, | 18 | HDMI_INFOFRAME_TYPE_AUDIO = 0x84, |
19 | }; | 19 | }; |
20 | 20 | ||
21 | #define HDMI_IDENTIFIER 0x000c03 | 21 | #define HDMI_IEEE_OUI 0x000c03 |
22 | #define HDMI_INFOFRAME_HEADER_SIZE 4 | 22 | #define HDMI_INFOFRAME_HEADER_SIZE 4 |
23 | #define HDMI_AVI_INFOFRAME_SIZE 13 | 23 | #define HDMI_AVI_INFOFRAME_SIZE 13 |
24 | #define HDMI_SPD_INFOFRAME_SIZE 25 | 24 | #define HDMI_SPD_INFOFRAME_SIZE 25 |