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
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, · 55 unmodified lines
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;
include/uapi/drm/drm_mode.h+0−6
@@ -89,8 +89,6 @@ extern "C" { · 88 unmodified lines
89#define DRM_MODE_PICTURE_ASPECT_NONE 089#define DRM_MODE_PICTURE_ASPECT_NONE 0
90#define DRM_MODE_PICTURE_ASPECT_4_3 190#define DRM_MODE_PICTURE_ASPECT_4_3 1
91#define DRM_MODE_PICTURE_ASPECT_16_9 291#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" { · 3 unmodified lines
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. */

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