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 /drivers/gpu/drm/drm_modes.c | |
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 'drivers/gpu/drm/drm_modes.c')
-rw-r--r-- | drivers/gpu/drm/drm_modes.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index ce6eeda02acf..e82298e4c25b 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c | |||
@@ -1507,12 +1507,6 @@ void drm_mode_convert_to_umode(struct drm_mode_modeinfo *out, | |||
1507 | case HDMI_PICTURE_ASPECT_16_9: | 1507 | case HDMI_PICTURE_ASPECT_16_9: |
1508 | out->flags |= DRM_MODE_FLAG_PIC_AR_16_9; | 1508 | out->flags |= DRM_MODE_FLAG_PIC_AR_16_9; |
1509 | break; | 1509 | break; |
1510 | case HDMI_PICTURE_ASPECT_64_27: | ||
1511 | out->flags |= DRM_MODE_FLAG_PIC_AR_64_27; | ||
1512 | break; | ||
1513 | case DRM_MODE_PICTURE_ASPECT_256_135: | ||
1514 | out->flags |= DRM_MODE_FLAG_PIC_AR_256_135; | ||
1515 | break; | ||
1516 | case HDMI_PICTURE_ASPECT_RESERVED: | 1510 | case HDMI_PICTURE_ASPECT_RESERVED: |
1517 | default: | 1511 | default: |
1518 | out->flags |= DRM_MODE_FLAG_PIC_AR_NONE; | 1512 | out->flags |= DRM_MODE_FLAG_PIC_AR_NONE; |
@@ -1574,12 +1568,6 @@ int drm_mode_convert_umode(struct drm_display_mode *out, | |||
1574 | case DRM_MODE_FLAG_PIC_AR_16_9: | 1568 | case DRM_MODE_FLAG_PIC_AR_16_9: |
1575 | out->picture_aspect_ratio |= HDMI_PICTURE_ASPECT_16_9; | 1569 | out->picture_aspect_ratio |= HDMI_PICTURE_ASPECT_16_9; |
1576 | break; | 1570 | break; |
1577 | case DRM_MODE_FLAG_PIC_AR_64_27: | ||
1578 | out->picture_aspect_ratio |= HDMI_PICTURE_ASPECT_64_27; | ||
1579 | break; | ||
1580 | case DRM_MODE_FLAG_PIC_AR_256_135: | ||
1581 | out->picture_aspect_ratio |= HDMI_PICTURE_ASPECT_256_135; | ||
1582 | break; | ||
1583 | default: | 1571 | default: |
1584 | out->picture_aspect_ratio = HDMI_PICTURE_ASPECT_NONE; | 1572 | out->picture_aspect_ratio = HDMI_PICTURE_ASPECT_NONE; |
1585 | break; | 1573 | break; |