[Intel-gfx] [PATCH 1/2] Revert "drm: Add and handle new aspect ratios in DRM layer"
Daniel Vetter
daniel.vetter at ffwll.ch
Thu Nov 3 16:02:14 UTC 2016
On Thu, Nov 3, 2016 at 1:47 PM, Sharma, Shashank
<shashank.sharma at intel.com> wrote:
> Hi Ville,
> (-dri-devel)
> I would appreciate an internal discussion before going to dri-devel.
Nack on internal discssion. We do development in the open.
> What did this patch break ?
> This is exposed in the same way, as the 3D flags.
> The information is already available in form of flags, all you have to do in userspace is read and print that. Its already being done in Android.
Yeah, the patch is missing details on the bug report and how it falls
apart, but if that's added revert might be the appropriate thing to do
here. Maintainer-ack on the revert if that crucial information is
added.
-Daniel
> NACK until we get to the right reason.
>
> Regards
> Shashank
> -----Original Message-----
> From: ville.syrjala at linux.intel.com [mailto:ville.syrjala at linux.intel.com]
> Sent: Thursday, November 3, 2016 6:02 PM
> To: dri-devel at lists.freedesktop.org
> Cc: Sharma, Shashank <shashank.sharma at intel.com>; Lin; Jia, Lin A <lin.a.jia at intel.com>; Sharma, Akashdeep <akashdeep.sharma at intel.com>; Jim Bride <jim.bride at linux.intel.com>; Jose Abreu <Jose.Abreu at synopsys.com>; Daniel Vetter <daniel.vetter at ffwll.ch>; Emil Velikov <emil.l.velikov at gmail.com>
> Subject: [PATCH 1/2] Revert "drm: Add and handle new aspect ratios in DRM layer"
>
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
>
> 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 at intel.com>
> Cc: Lin, Jia <lin.a.jia at intel.com>
> Cc: Akashdeep Sharma <akashdeep.sharma at intel.com>
> Cc: Jim Bride <jim.bride at linux.intel.com>
> Cc: Jose Abreu <Jose.Abreu at synopsys.com>
> Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
> Cc: Emil Velikov <emil.l.velikov at gmail.com>
> Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> ---
> drivers/gpu/drm/drm_modes.c | 12 ------------ include/uapi/drm/drm_mode.h | 6 ------
> 2 files changed, 18 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index f64ac86deb84..725faa6409aa 100644
> --- a/drivers/gpu/drm/drm_modes.c
> +++ b/drivers/gpu/drm/drm_modes.c
> @@ -1513,12 +1513,6 @@ void drm_mode_convert_to_umode(struct drm_mode_modeinfo *out,
> case HDMI_PICTURE_ASPECT_16_9:
> out->flags |= DRM_MODE_FLAG_PIC_AR_16_9;
> break;
> - case HDMI_PICTURE_ASPECT_64_27:
> - out->flags |= DRM_MODE_FLAG_PIC_AR_64_27;
> - break;
> - case DRM_MODE_PICTURE_ASPECT_256_135:
> - out->flags |= DRM_MODE_FLAG_PIC_AR_256_135;
> - break;
> case HDMI_PICTURE_ASPECT_RESERVED:
> default:
> out->flags |= DRM_MODE_FLAG_PIC_AR_NONE; @@ -1580,12 +1574,6 @@ int drm_mode_convert_umode(struct drm_display_mode *out,
> case DRM_MODE_FLAG_PIC_AR_16_9:
> out->picture_aspect_ratio |= HDMI_PICTURE_ASPECT_16_9;
> break;
> - case DRM_MODE_FLAG_PIC_AR_64_27:
> - out->picture_aspect_ratio |= HDMI_PICTURE_ASPECT_64_27;
> - break;
> - case DRM_MODE_FLAG_PIC_AR_256_135:
> - out->picture_aspect_ratio |= HDMI_PICTURE_ASPECT_256_135;
> - break;
> default:
> out->picture_aspect_ratio = HDMI_PICTURE_ASPECT_NONE;
> break;
> diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h index 084b50a02dc5..5c142b1387ac 100644
> --- a/include/uapi/drm/drm_mode.h
> +++ b/include/uapi/drm/drm_mode.h
> @@ -81,8 +81,6 @@ extern "C" {
> #define DRM_MODE_PICTURE_ASPECT_NONE 0
> #define DRM_MODE_PICTURE_ASPECT_4_3 1
> #define DRM_MODE_PICTURE_ASPECT_16_9 2
> -#define DRM_MODE_PICTURE_ASPECT_64_27 3
> -#define DRM_MODE_PICTURE_ASPECT_256_135 4
>
> /* Aspect ratio flag bitmask (4 bits 22:19) */
> #define DRM_MODE_FLAG_PIC_AR_MASK (0x0F<<19)
> @@ -92,10 +90,6 @@ extern "C" {
> (DRM_MODE_PICTURE_ASPECT_4_3<<19)
> #define DRM_MODE_FLAG_PIC_AR_16_9 \
> (DRM_MODE_PICTURE_ASPECT_16_9<<19)
> -#define DRM_MODE_FLAG_PIC_AR_64_27 \
> - (DRM_MODE_PICTURE_ASPECT_64_27<<19)
> -#define DRM_MODE_FLAG_PIC_AR_256_135 \
> - (DRM_MODE_PICTURE_ASPECT_256_135<<19)
>
> /* DPMS flags */
> /* bit compatible with the xorg definitions. */
> --
> 2.7.4
>
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
More information about the Intel-gfx
mailing list