All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] Revert "drm: Add and handle new aspect ratios in DRM layer"
@ 2016-11-03 12:31 ville.syrjala
  2016-11-03 12:31 ` [PATCH 2/2] Revert "drm: Add aspect ratio parsing " ville.syrjala
                   ` (2 more replies)
  0 siblings, 3 replies; 44+ messages in thread
From: ville.syrjala @ 2016-11-03 12:31 UTC (permalink / raw)
  To: dri-devel
  Cc: Jose Abreu, Jia, Akashdeep Sharma, Lin, Emil Velikov,
	Daniel Vetter, Jim Bride

From: Ville Syrjälä <ville.syrjala@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@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>
---
 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

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 44+ messages in thread

end of thread, other threads:[~2016-11-15 15:26 UTC | newest]

Thread overview: 44+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-11-03 12:31 [PATCH 1/2] Revert "drm: Add and handle new aspect ratios in DRM layer" ville.syrjala
2016-11-03 12:31 ` [PATCH 2/2] Revert "drm: Add aspect ratio parsing " ville.syrjala
2016-11-03 12:47   ` Sharma, Shashank
     [not found] ` <FF3DDC77922A8A4BB08A3BC48A1EA8CB411AE158@BGSMSX101.gar.corp.intel.com>
     [not found]   ` <20161103130253.GM4617@intel.com>
2016-11-03 13:04     ` [PATCH 1/2] Revert "drm: Add and handle new aspect ratios " Ville Syrjälä
2016-11-03 13:09       ` Ville Syrjälä
2016-11-03 13:22         ` Sharma, Shashank
     [not found]     ` <2ededbc1-b923-200e-8443-f1ee522402bf@intel.com>
2016-11-03 13:26       ` Ville Syrjälä
2016-11-03 13:34         ` Sharma, Shashank
2016-11-03 13:49           ` Ville Syrjälä
2016-11-03 16:03             ` Daniel Vetter
2016-11-03 16:19               ` Sharma, Shashank
2016-11-07  7:43                 ` Sharma, Shashank
2016-11-07 15:26                   ` Emil Velikov
2016-11-07 15:48                     ` Sharma, Shashank
2016-11-07 16:57                       ` Emil Velikov
2016-11-03 16:02   ` Daniel Vetter
2016-11-11 17:00 ` Ville Syrjälä
2016-11-11 17:03   ` Ville Syrjälä
2016-11-11 17:07   ` Alex Deucher
2016-11-11 17:08     ` Daniel Vetter
2016-11-11 17:22     ` Ville Syrjälä
2016-11-14 14:44   ` Sharma, Shashank
2016-11-14 15:49     ` Ville Syrjälä
2016-11-14 16:07       ` Sharma, Shashank
2016-11-14 16:20         ` Ville Syrjälä
2016-11-14 16:42           ` Sharma, Shashank
2016-11-14 16:45             ` Ville Syrjälä
2016-11-14 16:56               ` Sharma, Shashank
2016-11-15  8:51                 ` Daniel Vetter
2016-11-15  9:00                   ` Sharma, Shashank
2016-11-15 10:00                     ` Daniel Vetter
2016-11-15 10:06                       ` Sharma, Shashank
2016-11-15 10:52                         ` Daniel Vetter
2016-11-15 13:48                           ` Jose Abreu
2016-11-15 14:18                             ` Ville Syrjälä
2016-11-15 15:10                               ` Sharma, Shashank
2016-11-15 15:18                                 ` Ville Syrjälä
2016-11-15 15:13                               ` Sharma, Shashank
2016-11-15 13:54                       ` Ville Syrjälä
2016-11-15 14:03                         ` Daniel Vetter
2016-11-15 14:18                           ` Alex Deucher
2016-11-15 14:24                             ` Ville Syrjälä
2016-11-15 14:26                             ` Daniel Vetter
2016-11-15 15:26                               ` Alex Deucher

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.