diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2016-11-03 08:31:43 -0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-11-15 09:01:31 -0500 |
| commit | 7920232d54d97a35dbafc65cc6f6ffeefe9ecbbe (patch) | |
| tree | f764f5b0e4fe7def7d6f20f078f27376942d7f42 /include/uapi/drm/drm_mode.h | |
| parent | 2d5e836de7b24fa79c67085689ee8160302c76a9 (diff) | |
Revert "drm: Add and handle new aspect ratios in DRM layer"
This reverts commit a68362fe3e84fcbedd49939aa200519aa5410135.
Adding new mode flags willy nilly breaks existing userspace. We need to
coordinate this better, potentially with a new client cap that only
exposes the aspect ratio flags when userspace is prepared for them
(similar to what we do with stereo 3D modes).
Cc: Shashank Sharma <shashank.sharma@intel.com>
Cc: Lin, Jia <lin.a.jia@intel.com>
Cc: Akashdeep Sharma <akashdeep.sharma@intel.com>
Cc: Jim Bride <jim.bride@linux.intel.com>
Cc: Jose Abreu <Jose.Abreu@synopsys.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Emil Velikov <emil.l.velikov@gmail.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1478176304-6743-1-git-send-email-ville.syrjala@linux.intel.com
Diffstat (limited to 'include/uapi/drm/drm_mode.h')
| -rw-r--r-- | include/uapi/drm/drm_mode.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h index 01000c9f7c2c..ebf622f5b238 100644 --- a/include/uapi/drm/drm_mode.h +++ b/include/uapi/drm/drm_mode.h | |||
| @@ -89,8 +89,6 @@ extern "C" { | |||
| 89 | #define DRM_MODE_PICTURE_ASPECT_NONE 0 | 89 | #define DRM_MODE_PICTURE_ASPECT_NONE 0 |
| 90 | #define DRM_MODE_PICTURE_ASPECT_4_3 1 | 90 | #define DRM_MODE_PICTURE_ASPECT_4_3 1 |
| 91 | #define DRM_MODE_PICTURE_ASPECT_16_9 2 | 91 | #define DRM_MODE_PICTURE_ASPECT_16_9 2 |
| 92 | #define DRM_MODE_PICTURE_ASPECT_64_27 3 | ||
| 93 | #define DRM_MODE_PICTURE_ASPECT_256_135 4 | ||
| 94 | 92 | ||
| 95 | /* Aspect ratio flag bitmask (4 bits 22:19) */ | 93 | /* Aspect ratio flag bitmask (4 bits 22:19) */ |
| 96 | #define DRM_MODE_FLAG_PIC_AR_MASK (0x0F<<19) | 94 | #define DRM_MODE_FLAG_PIC_AR_MASK (0x0F<<19) |
| @@ -100,10 +98,6 @@ extern "C" { | |||
| 100 | (DRM_MODE_PICTURE_ASPECT_4_3<<19) | 98 | (DRM_MODE_PICTURE_ASPECT_4_3<<19) |
| 101 | #define DRM_MODE_FLAG_PIC_AR_16_9 \ | 99 | #define DRM_MODE_FLAG_PIC_AR_16_9 \ |
| 102 | (DRM_MODE_PICTURE_ASPECT_16_9<<19) | 100 | (DRM_MODE_PICTURE_ASPECT_16_9<<19) |
| 103 | #define DRM_MODE_FLAG_PIC_AR_64_27 \ | ||
| 104 | (DRM_MODE_PICTURE_ASPECT_64_27<<19) | ||
| 105 | #define DRM_MODE_FLAG_PIC_AR_256_135 \ | ||
| 106 | (DRM_MODE_PICTURE_ASPECT_256_135<<19) | ||
| 107 | 101 | ||
| 108 | /* DPMS flags */ | 102 | /* DPMS flags */ |
| 109 | /* bit compatible with the xorg definitions. */ | 103 | /* bit compatible with the xorg definitions. */ |
