diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-10-10 23:05:21 +0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-10-10 23:05:21 +0400 |
| commit | 62addcb8c188eaa28968e27a02518404939851d7 (patch) | |
| tree | 265f431c92c2c677474e390ada03397c56850a5b /include/drm | |
| parent | 5438ae88d098c086cfb94be5327c49a04fc6bfd7 (diff) | |
| parent | 64a742fac3a22f57303d8f1b7e347350a1c48254 (diff) | |
| download | linux-62addcb8c188eaa28968e27a02518404939851d7.tar.xz | |
Merge branch 'drm-intel-next' of git://people.freedesktop.org/~keithp/linux into drm-core-next
* 'drm-intel-next' of git://people.freedesktop.org/~keithp/linux:
drm/i915: Dumb down the semaphore logic
drm/i915: pass ELD to HDMI/DP audio driver
drm: support routines for HDMI/DP ELD
drm/i915: Enable dither whenever display bpc < frame buffer bpc
drm/i915: Enable dither whenever display bpc < frame buffer bpc
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drm_crtc.h | 9 | ||||
| -rw-r--r-- | include/drm/drm_edid.h | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 44335e57eaaa..802079809282 100644 --- 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 */ }; diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h index eacb415b309a..74ce91684629 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -230,4 +230,13 @@ struct edid { #define EDID_PRODUCT_ID(e) ((e)->prod_code[0] | ((e)->prod_code[1] << 8)) +struct drm_encoder; +struct drm_connector; +struct drm_display_mode; +void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid); +int drm_av_sync_delay(struct drm_connector *connector, + struct drm_display_mode *mode); +struct drm_connector *drm_select_eld(struct drm_encoder *encoder, + struct drm_display_mode *mode); + #endif /* __DRM_EDID_H__ */ |