| From 505b8dc01bed63c31636a7eb0b3981ff9d9caf7e Mon Sep 17 00:00:00 2001 |
| From: "Lespiau, Damien" <damien.lespiau@intel.com> |
| Date: Mon, 19 Aug 2013 16:59:00 +0100 |
| Subject: drm/edid: Move HDMI_IDENTIFIER to hdmi.h |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| 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> |
| (cherry picked from commit c782d2e73d1e69c863d03945907bc7fbc879a778) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/drm_edid.c | 1 - |
| include/linux/hdmi.h | 1 + |
| 2 files changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/gpu/drm/drm_edid.c |
| +++ b/drivers/gpu/drm/drm_edid.c |
| @@ -2292,7 +2292,6 @@ add_detailed_modes(struct drm_connector |
| return closure.modes; |
| } |
| |
| -#define HDMI_IDENTIFIER 0x000C03 |
| #define AUDIO_BLOCK 0x01 |
| #define VIDEO_BLOCK 0x02 |
| #define VENDOR_BLOCK 0x03 |
| --- a/include/linux/hdmi.h |
| +++ b/include/linux/hdmi.h |
| @@ -18,6 +18,7 @@ enum hdmi_infoframe_type { |
| HDMI_INFOFRAME_TYPE_AUDIO = 0x84, |
| }; |
| |
| +#define HDMI_IDENTIFIER 0x000c03 |
| #define HDMI_INFOFRAME_HEADER_SIZE 4 |
| #define HDMI_AVI_INFOFRAME_SIZE 13 |
| #define HDMI_SPD_INFOFRAME_SIZE 25 |
