aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLespiau, Damien <damien.lespiau@intel.com>2013-08-19 11:59:00 -0400
committerDave Airlie <airlied@gmail.com>2013-08-29 18:41:22 -0400
commitc782d2e73d1e69c863d03945907bc7fbc879a778 (patch)
tree90f47eb52fd6f2c7f1531e17b5a111911c8fa63f
parenta26a58e89a4e5f2ab006b6ea2b8f3c9a97ae2e77 (diff)
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: Damien Lespiau <damien.lespiau@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.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.c1
-rw-r--r--include/linux/hdmi.h1
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index d76d6089106f..3aa653fd03a7 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,
2317 return closure.modes; 2317 return closure.modes;
2318} 2318}
2319 2319
2320#define HDMI_IDENTIFIER 0x000C03
2321#define AUDIO_BLOCK 0x01 2320#define AUDIO_BLOCK 0x01
2322#define VIDEO_BLOCK 0x02 2321#define VIDEO_BLOCK 0x02
2323#define VENDOR_BLOCK 0x03 2322#define VENDOR_BLOCK 0x03
diff --git a/include/linux/hdmi.h b/include/linux/hdmi.h
index e733252c2b5d..37e0cd755284 100644
--- a/include/linux/hdmi.h
+++ b/include/linux/hdmi.h
@@ -18,6 +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_INFOFRAME_HEADER_SIZE 4 22#define HDMI_INFOFRAME_HEADER_SIZE 4
22#define HDMI_AVI_INFOFRAME_SIZE 13 23#define HDMI_AVI_INFOFRAME_SIZE 13
23#define HDMI_SPD_INFOFRAME_SIZE 25 24#define HDMI_SPD_INFOFRAME_SIZE 25