History

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).

Ville Syrjälä committed 10 years ago

Commit 79202321 parent 2d5e8362 files · +0 −18Browse files

Unified · Split

2 files
  1. drivers/gpu/drm/drm_modes.c +0 −12
  2. include/uapi/drm/drm_mode.h +0 −6
drivers/gpu/drm/drm_modes.c+0−12
@@ -1507,12 +1507,6 @@ void drm_mode_convert_to_umode(struct drm_mode_modeinfo *out, · 1506 unmodified lines
15071507 case HDMI_PICTURE_ASPECT_16_9:
15081508 out->flags |= DRM_MODE_FLAG_PIC_AR_16_9;
15091509 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;
15161510 case HDMI_PICTURE_ASPECT_RESERVED:
15171511 default:
15181512 out->flags |= DRM_MODE_FLAG_PIC_AR_NONE;
@@ -1574,12 +1568,6 @@ int drm_mode_convert_umode(struct drm_display_mode *out, · 55 unmodified lines
15741568 case DRM_MODE_FLAG_PIC_AR_16_9:
15751569 out->picture_aspect_ratio |= HDMI_PICTURE_ASPECT_16_9;
15761570 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;
15831571 default:
15841572 out->picture_aspect_ratio = HDMI_PICTURE_ASPECT_NONE;
15851573 break;
include/uapi/drm/drm_mode.h+0−6
@@ -89,8 +89,6 @@ extern "C" { · 88 unmodified lines
8989 #define DRM_MODE_PICTURE_ASPECT_NONE 0
9090 #define DRM_MODE_PICTURE_ASPECT_4_3 1
9191 #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
9492
9593 /* Aspect ratio flag bitmask (4 bits 22:19) */
9694 #define DRM_MODE_FLAG_PIC_AR_MASK (0x0F<<19)
@@ -100,10 +98,6 @@ extern "C" { · 3 unmodified lines
10098 (DRM_MODE_PICTURE_ASPECT_4_3<<19)
10199 #define DRM_MODE_FLAG_PIC_AR_16_9 \
102100 (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)
107101
108102 /* DPMS flags */
109103 /* bit compatible with the xorg definitions. */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t