diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2019-05-29 07:02:03 -0400 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2019-06-06 09:05:03 -0400 |
| commit | 382d2af64e7d7083eefcc8c7e6c780634174ce87 (patch) | |
| tree | 010b9c5901a4e44ed541be78d08c5f7ad365d773 /include/drm | |
| parent | f2f2bb60d998abde10de7e483ef9e17639892450 (diff) | |
drm/edid: Clean up DRM_EDID_DIGITAL_* flags
Give the "DFP 1.x" bit a proper name, and clean up the rest
of the bits defines as well.
Cc: Mario Kleiner <mario.kleiner.de@gmail.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190529110204.2384-1-ville.syrjala@linux.intel.com
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drm_edid.h | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h index 0e21e91c4314..88b63801f9db 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h | |||
| @@ -177,21 +177,23 @@ struct detailed_timing { | |||
| 177 | #define DRM_EDID_INPUT_BLANK_TO_BLACK (1 << 4) | 177 | #define DRM_EDID_INPUT_BLANK_TO_BLACK (1 << 4) |
| 178 | #define DRM_EDID_INPUT_VIDEO_LEVEL (3 << 5) | 178 | #define DRM_EDID_INPUT_VIDEO_LEVEL (3 << 5) |
| 179 | #define DRM_EDID_INPUT_DIGITAL (1 << 7) | 179 | #define DRM_EDID_INPUT_DIGITAL (1 << 7) |
| 180 | #define DRM_EDID_DIGITAL_DEPTH_MASK (7 << 4) | 180 | #define DRM_EDID_DIGITAL_DEPTH_MASK (7 << 4) /* 1.4 */ |
| 181 | #define DRM_EDID_DIGITAL_DEPTH_UNDEF (0 << 4) | 181 | #define DRM_EDID_DIGITAL_DEPTH_UNDEF (0 << 4) /* 1.4 */ |
| 182 | #define DRM_EDID_DIGITAL_DEPTH_6 (1 << 4) | 182 | #define DRM_EDID_DIGITAL_DEPTH_6 (1 << 4) /* 1.4 */ |
| 183 | #define DRM_EDID_DIGITAL_DEPTH_8 (2 << 4) | 183 | #define DRM_EDID_DIGITAL_DEPTH_8 (2 << 4) /* 1.4 */ |
| 184 | #define DRM_EDID_DIGITAL_DEPTH_10 (3 << 4) | 184 | #define DRM_EDID_DIGITAL_DEPTH_10 (3 << 4) /* 1.4 */ |
| 185 | #define DRM_EDID_DIGITAL_DEPTH_12 (4 << 4) | 185 | #define DRM_EDID_DIGITAL_DEPTH_12 (4 << 4) /* 1.4 */ |
| 186 | #define DRM_EDID_DIGITAL_DEPTH_14 (5 << 4) | 186 | #define DRM_EDID_DIGITAL_DEPTH_14 (5 << 4) /* 1.4 */ |
| 187 | #define DRM_EDID_DIGITAL_DEPTH_16 (6 << 4) | 187 | #define DRM_EDID_DIGITAL_DEPTH_16 (6 << 4) /* 1.4 */ |
| 188 | #define DRM_EDID_DIGITAL_DEPTH_RSVD (7 << 4) | 188 | #define DRM_EDID_DIGITAL_DEPTH_RSVD (7 << 4) /* 1.4 */ |
| 189 | #define DRM_EDID_DIGITAL_TYPE_UNDEF (0) | 189 | #define DRM_EDID_DIGITAL_TYPE_MASK (7 << 0) /* 1.4 */ |
| 190 | #define DRM_EDID_DIGITAL_TYPE_DVI (1) | 190 | #define DRM_EDID_DIGITAL_TYPE_UNDEF (0 << 0) /* 1.4 */ |
| 191 | #define DRM_EDID_DIGITAL_TYPE_HDMI_A (2) | 191 | #define DRM_EDID_DIGITAL_TYPE_DVI (1 << 0) /* 1.4 */ |
| 192 | #define DRM_EDID_DIGITAL_TYPE_HDMI_B (3) | 192 | #define DRM_EDID_DIGITAL_TYPE_HDMI_A (2 << 0) /* 1.4 */ |
| 193 | #define DRM_EDID_DIGITAL_TYPE_MDDI (4) | 193 | #define DRM_EDID_DIGITAL_TYPE_HDMI_B (3 << 0) /* 1.4 */ |
| 194 | #define DRM_EDID_DIGITAL_TYPE_DP (5) | 194 | #define DRM_EDID_DIGITAL_TYPE_MDDI (4 << 0) /* 1.4 */ |
| 195 | #define DRM_EDID_DIGITAL_TYPE_DP (5 << 0) /* 1.4 */ | ||
| 196 | #define DRM_EDID_DIGITAL_DFP_1_X (1 << 0) /* 1.3 */ | ||
| 195 | 197 | ||
| 196 | #define DRM_EDID_FEATURE_DEFAULT_GTF (1 << 0) | 198 | #define DRM_EDID_FEATURE_DEFAULT_GTF (1 << 0) |
| 197 | #define DRM_EDID_FEATURE_PREFERRED_TIMING (1 << 1) | 199 | #define DRM_EDID_FEATURE_PREFERRED_TIMING (1 << 1) |