Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc

[karo-tx-linux.git] / include / drm / drm_crtc.h

diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 44335e57eaaac08c6d219f4d02d6f9eb91bf3c9a..8020798092820b82813e2c6026c8507d9dbe5923 100644 (file)
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -466,6 +466,8 @@ enum drm_connector_force {
 /* DACs should rarely do this without a lot of testing */
 #define DRM_CONNECTOR_POLL_DISCONNECT (1 << 2)
 
+#define MAX_ELD_BYTES  128
+
 /**
  * drm_connector - central DRM connector control structure
  * @crtc: CRTC this connector is currently connected to, NULL if none
@@ -523,6 +525,13 @@ struct drm_connector {
        uint32_t force_encoder_id;
        struct drm_encoder *encoder; /* currently active encoder */
 
+       /* EDID bits */
+       uint8_t eld[MAX_ELD_BYTES];
+       bool dvi_dual;
+       int max_tmds_clock;     /* in MHz */
+       bool latency_present[2];
+       int video_latency[2];   /* [0]: progressive, [1]: interlaced */
+       int audio_latency[2];
        int null_edid_counter; /* needed to workaround some HW bugs where we get all 0s */
 };