diff options
| author | Zheng Yang <zhengyang@rock-chips.com> | 2017-06-21 15:08:03 +0800 |
|---|---|---|
| committer | Jianqun Xu <jay.xu@rock-chips.com> | 2017-06-27 17:22:33 +0800 |
| commit | afb31b9c18d0d7b5e9fffc0ce94a0647e3386450 (patch) | |
| tree | afe6d719a099f62caa89d1458761b7e672d3293d /include/drm | |
| parent | 31fa2abc81a46527cf25a2c00a5b09b36beed8cc (diff) | |
Revert "FROMLIST: drm: edid: HDMI 2.0 HF-VSDB block parsing"
This reverts commit 6e9aa006c4ae10f95bba0121c26b06363efb3b96.
UPSTREAM code has support parsing HDMI.20 HF-VSDB.
Change-Id: Ia25ee6a92e9a2fee4b3356446c1198e938c5e74d
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drm_crtc.h | 12 | ||||
| -rw-r--r-- | include/drm/drm_edid.h | 5 |
2 files changed, 0 insertions, 17 deletions
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index d7e55bec7f17..f9f3ad1a69be 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -786,11 +786,6 @@ struct drm_encoder { * @audio_latency: audio latency info from ELD, if found * @null_edid_counter: track sinks that give us all zeros for the EDID * @bad_edid_counter: track sinks that give us an EDID with invalid checksum - * @max_tmds_char: indicates the maximum TMDS Character Rate supported - * @scdc_present: when set the sink supports SCDC functionality - * @rr_capable: when set the sink is capable of initiating an SCDC read request - * @lte_340mcsc_scramble: when set the sink supports less than 340Mcsc scramble - * @flags_3d: 3D view(s) supported by the sink, see drm_edid.h (DRM_EDID_3D_*) * @edid_corrupt: indicates whether the last read EDID was corrupt * @debugfs_entry: debugfs directory for this connector * @state: current atomic state for this connector @@ -864,13 +859,6 @@ struct drm_connector { int null_edid_counter; /* needed to workaround some HW bugs where we get all 0s */ unsigned bad_edid_counter; - /* EDID bits HDMI 2.0 */ - int max_tmds_char; /* in Mcsc */ - bool scdc_present; - bool rr_capable; - bool lte_340mcsc_scramble; - int flags_3d; - /* Flag for raw EDID header corruption - used in Displayport * compliance testing - * Displayport Link CTS Core 1.2 rev1.1 4.2.2.6 */ diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h index 820ad9e33884..f012f9e7afe2 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -266,11 +266,6 @@ struct detailed_timing { #define DRM_ELD_CEA_SAD(mnl, sad) (20 + (mnl) + 3 * (sad)) -/* HDMI 2.0 */ -#define DRM_EDID_3D_INDEPENDENT_VIEW (1 << 2) -#define DRM_EDID_3D_DUAL_VIEW (1 << 1) -#define DRM_EDID_3D_OSD_DISPARITY (1 << 0) - struct edid { u8 header[8]; /* Vendor & product info */ |