diff options
author | Jani Nikula <jani.nikula@intel.com> | 2023-09-15 11:23:38 +0300 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2023-09-15 11:23:38 +0300 |
commit | a3f9e4bc1ec9d8f1e352eb7c1cbaea3168246be7 (patch) | |
tree | 5a2ad89248d8fe7a2da8904dd29042abb9f71739 /include/drm/drm_edid.h | |
parent | 3106c34df6ace8a123027b9afdc73bb05d530052 (diff) | |
parent | 0bb80ecc33a8fb5a682236443c1e740d5c917d1d (diff) | |
download | linux-a3f9e4bc1ec9d8f1e352eb7c1cbaea3168246be7.tar.xz |
Merge drm/drm-next into drm-intel-next
Sync to v6.6-rc1.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'include/drm/drm_edid.h')
-rw-r--r-- | include/drm/drm_edid.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h index e8d850e77d6d..882d2638708e 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -61,15 +61,9 @@ struct std_timing { u8 vfreq_aspect; } __attribute__((packed)); -#define DRM_EDID_PT_SYNC_MASK (3 << 3) -# define DRM_EDID_PT_ANALOG_CSYNC (0 << 3) -# define DRM_EDID_PT_BIPOLAR_ANALOG_CSYNC (1 << 3) -# define DRM_EDID_PT_DIGITAL_CSYNC (2 << 3) -# define DRM_EDID_PT_CSYNC_ON_RGB (1 << 1) /* analog csync only */ -# define DRM_EDID_PT_CSYNC_SERRATE (1 << 2) -# define DRM_EDID_PT_DIGITAL_SEPARATE_SYNC (3 << 3) -# define DRM_EDID_PT_HSYNC_POSITIVE (1 << 1) /* also digital csync */ -# define DRM_EDID_PT_VSYNC_POSITIVE (1 << 2) +#define DRM_EDID_PT_HSYNC_POSITIVE (1 << 1) +#define DRM_EDID_PT_VSYNC_POSITIVE (1 << 2) +#define DRM_EDID_PT_SEPARATE_SYNC (3 << 3) #define DRM_EDID_PT_STEREO (1 << 5) #define DRM_EDID_PT_INTERLACED (1 << 7) |