* [PATCH 0/5] Add aspect ratio parsing
@ 2016-03-25 8:17 Shashank Sharma
2016-03-25 8:17 ` [PATCH 1/5] drm: add picture aspect ratio flags Shashank Sharma
` (5 more replies)
0 siblings, 6 replies; 11+ messages in thread
From: Shashank Sharma @ 2016-03-25 8:17 UTC (permalink / raw)
To: dri-devel, airlied, linux-fbdev; +Cc: daniel.vetter, intel-gfx, plagnioj
Currently DRM framework doesn't parse aspect ratio of a videomode
while converting it from a umode->kmode or viceversa. This causes
modeset of CEA modes with incorrect aspect ratio.
While running HDMI complaince, tests (like 7-27) expect the DUT
to apply the mode as per the VIC, but as driver does not consider
the aspect ratio part while searching a mode from modedb, we end
up setting mode with a wrong VIC, causing the test to fail.
What this patch set does:
Patch 1-2
- Adds aspect ratio flags in the DRM layer, in form of flags.
- Adds parsing of aspect ratio, during conversion of a umode->kmode
and viceversa.
- Adds aspect ratio check while finding a mode, during modeset.
Patch 3-5
- Adds some new aspect ratio defined in CEA-861-F specs to
support HDMI 2.0 displays, in DRM and I915 layer.
Shashank Sharma (5):
drm: add picture aspect ratio flags
drm: Add aspect ratio parsing in DRM layer
video: Add new aspect ratios for HDMI 2.0
drm: Add flags for new aspect ratios
drm/i915: Add support for new aspect ratios
drivers/gpu/drm/drm_modes.c | 46 +++++++++++++++++++++++++++++++++++++++
drivers/gpu/drm/i915/intel_hdmi.c | 6 +++++
drivers/gpu/drm/i915/intel_sdvo.c | 6 +++++
drivers/video/hdmi.c | 4 ++++
include/linux/hdmi.h | 2 ++
include/uapi/drm/drm_mode.h | 24 +++++++++++++++-----
6 files changed, 83 insertions(+), 5 deletions(-)
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH 1/5] drm: add picture aspect ratio flags 2016-03-25 8:17 [PATCH 0/5] Add aspect ratio parsing Shashank Sharma @ 2016-03-25 8:17 ` Shashank Sharma 2016-03-25 8:17 ` [PATCH 2/5] drm: Add aspect ratio parsing in DRM layer Shashank Sharma ` (4 subsequent siblings) 5 siblings, 0 replies; 11+ messages in thread From: Shashank Sharma @ 2016-03-25 8:17 UTC (permalink / raw) To: dri-devel, airlied, linux-fbdev; +Cc: daniel.vetter, intel-gfx, plagnioj This patch adds drm flag bits for aspect ratio information Currently drm flag bits don't have field for mode's picture aspect ratio. This field will help the driver to pick mode with right aspect ratio, and help in setting right VIC field in avi infoframes. Signed-off-by: Shashank Sharma <shashank.sharma@intel.com> --- include/uapi/drm/drm_mode.h | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h index c021743..0dc9f6b 100644 --- a/include/uapi/drm/drm_mode.h +++ b/include/uapi/drm/drm_mode.h @@ -73,6 +73,19 @@ #define DRM_MODE_FLAG_3D_TOP_AND_BOTTOM (7<<14) #define DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF (8<<14) +/* Picture aspect ratio options */ +#define DRM_MODE_PICTURE_ASPECT_NONE 0 +#define DRM_MODE_PICTURE_ASPECT_4_3 1 +#define DRM_MODE_PICTURE_ASPECT_16_9 2 + +/* Aspect ratio flag bitmask (4 bits 21:19) */ +#define DRM_MODE_FLAG_PARMASK (0x0F<<19) +#define DRM_MODE_FLAG_PARNONE \ + (DRM_MODE_PICTURE_ASPECT_NONE << 19) +#define DRM_MODE_FLAG_PAR4_3 \ + (DRM_MODE_PICTURE_ASPECT_4_3 << 19) +#define DRM_MODE_FLAG_PAR16_9 \ + (DRM_MODE_PICTURE_ASPECT_16_9 << 19) /* DPMS flags */ /* bit compatible with the xorg definitions. */ @@ -88,11 +101,6 @@ #define DRM_MODE_SCALE_CENTER 2 /* Centered, no scaling */ #define DRM_MODE_SCALE_ASPECT 3 /* Full screen, preserve aspect */ -/* Picture aspect ratio options */ -#define DRM_MODE_PICTURE_ASPECT_NONE 0 -#define DRM_MODE_PICTURE_ASPECT_4_3 1 -#define DRM_MODE_PICTURE_ASPECT_16_9 2 - /* Dithering mode options */ #define DRM_MODE_DITHERING_OFF 0 #define DRM_MODE_DITHERING_ON 1 -- 1.9.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/5] drm: Add aspect ratio parsing in DRM layer 2016-03-25 8:17 [PATCH 0/5] Add aspect ratio parsing Shashank Sharma 2016-03-25 8:17 ` [PATCH 1/5] drm: add picture aspect ratio flags Shashank Sharma @ 2016-03-25 8:17 ` Shashank Sharma 2016-03-25 8:17 ` [PATCH 3/5] video: Add new aspect ratios for HDMI 2.0 Shashank Sharma ` (3 subsequent siblings) 5 siblings, 0 replies; 11+ messages in thread From: Shashank Sharma @ 2016-03-25 8:17 UTC (permalink / raw) To: dri-devel, airlied, linux-fbdev; +Cc: daniel.vetter, intel-gfx, plagnioj Current DRM layer functions dont parse aspect ratio information while converting a user mode->kernel mode or viceversa. This causes modeset to pick mode with wrong aspect ratio, eventually cauing failures in HDMI compliance test cases, due to wrong VIC. This patch adds aspect ratio information in DRM's mode conversion and mode comparision functions, to make sure kernel picks mode with right aspect ratio (as per the VIC). Signed-off-by: Shashank Sharma <shashank.sharma@intel.com> Signed-off-by: Lin, Jia <lin.a.jia@intel.com> Signed-off-by: Akashdeep Sharma <akashdeep.sharma@intel.com> --- drivers/gpu/drm/drm_modes.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index f7448a5..6e66136 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -939,6 +939,9 @@ bool drm_mode_equal_no_clocks(const struct drm_display_mode *mode1, const struct (mode2->flags & DRM_MODE_FLAG_3D_MASK)) return false; + if (mode1->picture_aspect_ratio != mode2->picture_aspect_ratio) + return false; + return drm_mode_equal_no_clocks_no_stereo(mode1, mode2); } EXPORT_SYMBOL(drm_mode_equal_no_clocks); @@ -967,6 +970,7 @@ bool drm_mode_equal_no_clocks_no_stereo(const struct drm_display_mode *mode1, mode1->vsync_end == mode2->vsync_end && mode1->vtotal == mode2->vtotal && mode1->vscan == mode2->vscan && + mode1->picture_aspect_ratio == mode2->picture_aspect_ratio && (mode1->flags & ~DRM_MODE_FLAG_3D_MASK) == (mode2->flags & ~DRM_MODE_FLAG_3D_MASK)) return true; @@ -1469,6 +1473,22 @@ void drm_mode_convert_to_umode(struct drm_mode_modeinfo *out, out->vrefresh = in->vrefresh; out->flags = in->flags; out->type = in->type; + out->flags &= ~DRM_MODE_FLAG_PARMASK; + + switch (in->picture_aspect_ratio) { + case HDMI_PICTURE_ASPECT_4_3: + out->flags |= DRM_MODE_FLAG_PAR4_3; + break; + case HDMI_PICTURE_ASPECT_16_9: + out->flags |= DRM_MODE_FLAG_PAR16_9; + break; + case HDMI_PICTURE_ASPECT_NONE: + case HDMI_PICTURE_ASPECT_RESERVED: + default: + out->flags |= DRM_MODE_FLAG_PARNONE; + break; + } + strncpy(out->name, in->name, DRM_DISPLAY_MODE_LEN); out->name[DRM_DISPLAY_MODE_LEN-1] = 0; } @@ -1514,6 +1534,20 @@ int drm_mode_convert_umode(struct drm_display_mode *out, strncpy(out->name, in->name, DRM_DISPLAY_MODE_LEN); out->name[DRM_DISPLAY_MODE_LEN-1] = 0; + /* Clearing picture aspect ratio bits from out flags */ + out->flags &= ~DRM_MODE_FLAG_PARMASK; + + switch (in->flags & DRM_MODE_FLAG_PARMASK) { + case DRM_MODE_FLAG_PAR4_3: + out->picture_aspect_ratio |= HDMI_PICTURE_ASPECT_4_3; + break; + case DRM_MODE_FLAG_PAR16_9: + out->picture_aspect_ratio |= HDMI_PICTURE_ASPECT_16_9; + break; + default: + out->picture_aspect_ratio = HDMI_PICTURE_ASPECT_NONE; + } + out->status = drm_mode_validate_basic(out); if (out->status != MODE_OK) goto out; -- 1.9.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 3/5] video: Add new aspect ratios for HDMI 2.0 2016-03-25 8:17 [PATCH 0/5] Add aspect ratio parsing Shashank Sharma 2016-03-25 8:17 ` [PATCH 1/5] drm: add picture aspect ratio flags Shashank Sharma 2016-03-25 8:17 ` [PATCH 2/5] drm: Add aspect ratio parsing in DRM layer Shashank Sharma @ 2016-03-25 8:17 ` Shashank Sharma 2016-03-25 8:17 ` [PATCH 4/5] drm: Add flags for new aspect ratios Shashank Sharma ` (2 subsequent siblings) 5 siblings, 0 replies; 11+ messages in thread From: Shashank Sharma @ 2016-03-25 8:17 UTC (permalink / raw) To: dri-devel, airlied, linux-fbdev; +Cc: daniel.vetter, intel-gfx, plagnioj HDMI 2.0/CEA-861-F introduces two new aspect ratios: - 64:27 - 256:135 This patch adds enumeration for the new aspect ratios in the existing aspect ratio list. Signed-off-by: Shashank Sharma <shashank.sharma@intel.com> --- drivers/video/hdmi.c | 4 ++++ include/linux/hdmi.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/drivers/video/hdmi.c b/drivers/video/hdmi.c index 1626892..1cf907e 100644 --- a/drivers/video/hdmi.c +++ b/drivers/video/hdmi.c @@ -533,6 +533,10 @@ hdmi_picture_aspect_get_name(enum hdmi_picture_aspect picture_aspect) return "4:3"; case HDMI_PICTURE_ASPECT_16_9: return "16:9"; + case HDMI_PICTURE_ASPECT_64_27: + return "64:27"; + case HDMI_PICTURE_ASPECT_256_135: + return "256:135"; case HDMI_PICTURE_ASPECT_RESERVED: return "Reserved"; } diff --git a/include/linux/hdmi.h b/include/linux/hdmi.h index e974420..edbb4fc 100644 --- a/include/linux/hdmi.h +++ b/include/linux/hdmi.h @@ -78,6 +78,8 @@ enum hdmi_picture_aspect { HDMI_PICTURE_ASPECT_NONE, HDMI_PICTURE_ASPECT_4_3, HDMI_PICTURE_ASPECT_16_9, + HDMI_PICTURE_ASPECT_64_27, + HDMI_PICTURE_ASPECT_256_135, HDMI_PICTURE_ASPECT_RESERVED, }; -- 1.9.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 4/5] drm: Add flags for new aspect ratios 2016-03-25 8:17 [PATCH 0/5] Add aspect ratio parsing Shashank Sharma ` (2 preceding siblings ...) 2016-03-25 8:17 ` [PATCH 3/5] video: Add new aspect ratios for HDMI 2.0 Shashank Sharma @ 2016-03-25 8:17 ` Shashank Sharma 2016-03-25 8:17 ` [PATCH 5/5] drm/i915: Add support " Shashank Sharma 2016-03-25 9:32 ` ✗ Fi.CI.BAT: warning for Add aspect ratio parsing (rev3) Patchwork 5 siblings, 0 replies; 11+ messages in thread From: Shashank Sharma @ 2016-03-25 8:17 UTC (permalink / raw) To: dri-devel, airlied, linux-fbdev; +Cc: daniel.vetter, intel-gfx, plagnioj HDMI 2.0/CEA-861-F introduces two new aspect ratios: - 64:27 - 256:135 This patch adds DRM flags for the new aspect ratios in the existing aspect ratio flags. Signed-off-by: Shashank Sharma <shashank.sharma@intel.com> --- include/uapi/drm/drm_mode.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h index 0dc9f6b..05a808d 100644 --- a/include/uapi/drm/drm_mode.h +++ b/include/uapi/drm/drm_mode.h @@ -77,6 +77,8 @@ #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 21:19) */ #define DRM_MODE_FLAG_PARMASK (0x0F<<19) @@ -86,6 +88,10 @@ (DRM_MODE_PICTURE_ASPECT_4_3 << 19) #define DRM_MODE_FLAG_PAR16_9 \ (DRM_MODE_PICTURE_ASPECT_16_9 << 19) +#define DRM_MODE_FLAG_PAR64_27 \ + (DRM_MODE_PICTURE_ASPECT_64_27 << 19) +#define DRM_MODE_FLAG_PAR256_135 \ + (DRM_MODE_PICTURE_ASPECT_256_135 << 19) /* DPMS flags */ /* bit compatible with the xorg definitions. */ -- 1.9.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 5/5] drm/i915: Add support for new aspect ratios 2016-03-25 8:17 [PATCH 0/5] Add aspect ratio parsing Shashank Sharma ` (3 preceding siblings ...) 2016-03-25 8:17 ` [PATCH 4/5] drm: Add flags for new aspect ratios Shashank Sharma @ 2016-03-25 8:17 ` Shashank Sharma 2016-04-21 15:04 ` Daniel Vetter 2016-03-25 9:32 ` ✗ Fi.CI.BAT: warning for Add aspect ratio parsing (rev3) Patchwork 5 siblings, 1 reply; 11+ messages in thread From: Shashank Sharma @ 2016-03-25 8:17 UTC (permalink / raw) To: dri-devel, airlied, linux-fbdev; +Cc: daniel.vetter, intel-gfx, plagnioj HDMI 2.0/CEA-861-F introduces two new aspect ratios: - 64:27 - 256:135 This patch adds support for these aspect ratios in I915 driver, at various places. Signed-off-by: Shashank Sharma <shashank.sharma@intel.com> --- drivers/gpu/drm/drm_modes.c | 12 ++++++++++++ drivers/gpu/drm/i915/intel_hdmi.c | 6 ++++++ drivers/gpu/drm/i915/intel_sdvo.c | 6 ++++++ 3 files changed, 24 insertions(+) diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index 6e66136..11f219a 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -1482,6 +1482,12 @@ void drm_mode_convert_to_umode(struct drm_mode_modeinfo *out, case HDMI_PICTURE_ASPECT_16_9: out->flags |= DRM_MODE_FLAG_PAR16_9; break; + case HDMI_PICTURE_ASPECT_64_27: + out->flags |= DRM_MODE_FLAG_PAR64_27; + break; + case DRM_MODE_PICTURE_ASPECT_256_135: + out->flags |= DRM_MODE_FLAG_PAR256_135; + break; case HDMI_PICTURE_ASPECT_NONE: case HDMI_PICTURE_ASPECT_RESERVED: default: @@ -1544,6 +1550,12 @@ int drm_mode_convert_umode(struct drm_display_mode *out, case DRM_MODE_FLAG_PAR16_9: out->picture_aspect_ratio |= HDMI_PICTURE_ASPECT_16_9; break; + case DRM_MODE_FLAG_PAR64_27: + out->picture_aspect_ratio |= HDMI_PICTURE_ASPECT_64_27; + break; + case DRM_MODE_FLAG_PAR256_135: + out->picture_aspect_ratio |= HDMI_PICTURE_ASPECT_256_135; + break; default: out->picture_aspect_ratio = HDMI_PICTURE_ASPECT_NONE; } diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index e2dab48..bc8e2c8 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -1545,6 +1545,12 @@ intel_hdmi_set_property(struct drm_connector *connector, case DRM_MODE_PICTURE_ASPECT_16_9: intel_hdmi->aspect_ratio = HDMI_PICTURE_ASPECT_16_9; break; + case DRM_MODE_PICTURE_ASPECT_64_27: + intel_hdmi->aspect_ratio = HDMI_PICTURE_ASPECT_64_27; + break; + case DRM_MODE_PICTURE_ASPECT_256_135: + intel_hdmi->aspect_ratio = HDMI_PICTURE_ASPECT_256_135; + break; default: return -EINVAL; } diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index fae64bc..370e4f9 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c @@ -2071,6 +2071,12 @@ intel_sdvo_set_property(struct drm_connector *connector, case DRM_MODE_PICTURE_ASPECT_16_9: intel_sdvo->aspect_ratio = HDMI_PICTURE_ASPECT_16_9; break; + case DRM_MODE_PICTURE_ASPECT_64_27: + intel_sdvo->aspect_ratio = HDMI_PICTURE_ASPECT_64_27; + break; + case DRM_MODE_PICTURE_ASPECT_256_135: + intel_sdvo->aspect_ratio = HDMI_PICTURE_ASPECT_256_135; + break; default: return -EINVAL; } -- 1.9.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 5/5] drm/i915: Add support for new aspect ratios 2016-03-25 8:17 ` [PATCH 5/5] drm/i915: Add support " Shashank Sharma @ 2016-04-21 15:04 ` Daniel Vetter 2016-04-22 5:28 ` Sharma, Shashank 0 siblings, 1 reply; 11+ messages in thread From: Daniel Vetter @ 2016-04-21 15:04 UTC (permalink / raw) To: Shashank Sharma Cc: linux-fbdev, airlied, intel-gfx, dri-devel, daniel.vetter, plagnioj On Fri, Mar 25, 2016 at 01:47:35PM +0530, Shashank Sharma wrote: > HDMI 2.0/CEA-861-F introduces two new aspect ratios: > - 64:27 > - 256:135 > > This patch adds support for these aspect ratios in > I915 driver, at various places. > > Signed-off-by: Shashank Sharma <shashank.sharma@intel.com> Ok, we discussed this a bit internally and I had some questions. Reading this series patches make sense up to this one, but here I have a few questions/comments. > --- > drivers/gpu/drm/drm_modes.c | 12 ++++++++++++ > drivers/gpu/drm/i915/intel_hdmi.c | 6 ++++++ > drivers/gpu/drm/i915/intel_sdvo.c | 6 ++++++ > 3 files changed, 24 insertions(+) > > diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c > index 6e66136..11f219a 100644 > --- a/drivers/gpu/drm/drm_modes.c > +++ b/drivers/gpu/drm/drm_modes.c > @@ -1482,6 +1482,12 @@ void drm_mode_convert_to_umode(struct drm_mode_modeinfo *out, > case HDMI_PICTURE_ASPECT_16_9: > out->flags |= DRM_MODE_FLAG_PAR16_9; > break; > + case HDMI_PICTURE_ASPECT_64_27: > + out->flags |= DRM_MODE_FLAG_PAR64_27; > + break; > + case DRM_MODE_PICTURE_ASPECT_256_135: > + out->flags |= DRM_MODE_FLAG_PAR256_135; > + break; > case HDMI_PICTURE_ASPECT_NONE: > case HDMI_PICTURE_ASPECT_RESERVED: > default: > @@ -1544,6 +1550,12 @@ int drm_mode_convert_umode(struct drm_display_mode *out, > case DRM_MODE_FLAG_PAR16_9: > out->picture_aspect_ratio |= HDMI_PICTURE_ASPECT_16_9; > break; > + case DRM_MODE_FLAG_PAR64_27: > + out->picture_aspect_ratio |= HDMI_PICTURE_ASPECT_64_27; > + break; > + case DRM_MODE_FLAG_PAR256_135: > + out->picture_aspect_ratio |= HDMI_PICTURE_ASPECT_256_135; > + break; > default: > out->picture_aspect_ratio = HDMI_PICTURE_ASPECT_NONE; > } Above two parts is core enabling, I guess those should be squashed into the preceeding patch? > diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c > index e2dab48..bc8e2c8 100644 > --- a/drivers/gpu/drm/i915/intel_hdmi.c > +++ b/drivers/gpu/drm/i915/intel_hdmi.c > @@ -1545,6 +1545,12 @@ intel_hdmi_set_property(struct drm_connector *connector, > case DRM_MODE_PICTURE_ASPECT_16_9: > intel_hdmi->aspect_ratio = HDMI_PICTURE_ASPECT_16_9; > break; > + case DRM_MODE_PICTURE_ASPECT_64_27: > + intel_hdmi->aspect_ratio = HDMI_PICTURE_ASPECT_64_27; > + break; > + case DRM_MODE_PICTURE_ASPECT_256_135: > + intel_hdmi->aspect_ratio = HDMI_PICTURE_ASPECT_256_135; > + break; > default: > return -EINVAL; > } > diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c > index fae64bc..370e4f9 100644 > --- a/drivers/gpu/drm/i915/intel_sdvo.c > +++ b/drivers/gpu/drm/i915/intel_sdvo.c > @@ -2071,6 +2071,12 @@ intel_sdvo_set_property(struct drm_connector *connector, > case DRM_MODE_PICTURE_ASPECT_16_9: > intel_sdvo->aspect_ratio = HDMI_PICTURE_ASPECT_16_9; > break; > + case DRM_MODE_PICTURE_ASPECT_64_27: > + intel_sdvo->aspect_ratio = HDMI_PICTURE_ASPECT_64_27; > + break; > + case DRM_MODE_PICTURE_ASPECT_256_135: > + intel_sdvo->aspect_ratio = HDMI_PICTURE_ASPECT_256_135; > + break; > default: > return -EINVAL; > } The trouble with the aspect_ratio prop as currently implemented is that we currently unconditionally overwrite adjusted_mode->picture_aspect_ratio with it. But your patches here move the aspect ratio handling into drm_mode_modeinfo (uabi) and drm_display_mode (kernel-internal), where it imo belongs. But we need to figure out how to the interaction with the property correctly. What's probably needed is a new value in the aspect_ratio enum called "default", which selects the aspect_ratio from the mode. Only when userspace overrides (NONE, or one of the CEA aspect ratios) would we obey the aspect_ratio of the property. Otherwise the aspect ratio stored in the mode would be lost. The other bit that I can't find in this series is making sure we compute the VIC correctly for the new modes. Or does that magically work correctly since we compare the full mode when selecting VICs? Thanks, Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 5/5] drm/i915: Add support for new aspect ratios 2016-04-21 15:04 ` Daniel Vetter @ 2016-04-22 5:28 ` Sharma, Shashank 2016-04-22 8:09 ` [Intel-gfx] " Daniel Vetter 0 siblings, 1 reply; 11+ messages in thread From: Sharma, Shashank @ 2016-04-22 5:28 UTC (permalink / raw) To: Daniel Vetter Cc: linux-fbdev, airlied, intel-gfx, dri-devel, daniel.vetter, plagnioj Thanks for the review Daniel. My comments inline. Regards Shashank On 4/21/2016 8:34 PM, Daniel Vetter wrote: > On Fri, Mar 25, 2016 at 01:47:35PM +0530, Shashank Sharma wrote: >> HDMI 2.0/CEA-861-F introduces two new aspect ratios: >> - 64:27 >> - 256:135 >> >> This patch adds support for these aspect ratios in >> I915 driver, at various places. >> >> Signed-off-by: Shashank Sharma <shashank.sharma@intel.com> > > Ok, we discussed this a bit internally and I had some questions. Reading > this series patches make sense up to this one, but here I have a few > questions/comments. > >> --- >> drivers/gpu/drm/drm_modes.c | 12 ++++++++++++ >> drivers/gpu/drm/i915/intel_hdmi.c | 6 ++++++ >> drivers/gpu/drm/i915/intel_sdvo.c | 6 ++++++ >> 3 files changed, 24 insertions(+) >> >> diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c >> index 6e66136..11f219a 100644 >> --- a/drivers/gpu/drm/drm_modes.c >> +++ b/drivers/gpu/drm/drm_modes.c >> @@ -1482,6 +1482,12 @@ void drm_mode_convert_to_umode(struct drm_mode_modeinfo *out, >> case HDMI_PICTURE_ASPECT_16_9: >> out->flags |= DRM_MODE_FLAG_PAR16_9; >> break; >> + case HDMI_PICTURE_ASPECT_64_27: >> + out->flags |= DRM_MODE_FLAG_PAR64_27; >> + break; >> + case DRM_MODE_PICTURE_ASPECT_256_135: >> + out->flags |= DRM_MODE_FLAG_PAR256_135; >> + break; >> case HDMI_PICTURE_ASPECT_NONE: >> case HDMI_PICTURE_ASPECT_RESERVED: >> default: >> @@ -1544,6 +1550,12 @@ int drm_mode_convert_umode(struct drm_display_mode *out, >> case DRM_MODE_FLAG_PAR16_9: >> out->picture_aspect_ratio |= HDMI_PICTURE_ASPECT_16_9; >> break; >> + case DRM_MODE_FLAG_PAR64_27: >> + out->picture_aspect_ratio |= HDMI_PICTURE_ASPECT_64_27; >> + break; >> + case DRM_MODE_FLAG_PAR256_135: >> + out->picture_aspect_ratio |= HDMI_PICTURE_ASPECT_256_135; >> + break; >> default: >> out->picture_aspect_ratio = HDMI_PICTURE_ASPECT_NONE; >> } > > Above two parts is core enabling, I guess those should be squashed into > the preceeding patch? > Sure, we can do this. The idea was to create a separate patch for new aspect ratio, so that one can segregate HDMI 2.0 patches and HDMI 1.4 patches. If you still recommend this, I can move this part in next patch. >> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c >> index e2dab48..bc8e2c8 100644 >> --- a/drivers/gpu/drm/i915/intel_hdmi.c >> +++ b/drivers/gpu/drm/i915/intel_hdmi.c >> @@ -1545,6 +1545,12 @@ intel_hdmi_set_property(struct drm_connector *connector, >> case DRM_MODE_PICTURE_ASPECT_16_9: >> intel_hdmi->aspect_ratio = HDMI_PICTURE_ASPECT_16_9; >> break; >> + case DRM_MODE_PICTURE_ASPECT_64_27: >> + intel_hdmi->aspect_ratio = HDMI_PICTURE_ASPECT_64_27; >> + break; >> + case DRM_MODE_PICTURE_ASPECT_256_135: >> + intel_hdmi->aspect_ratio = HDMI_PICTURE_ASPECT_256_135; >> + break; >> default: >> return -EINVAL; >> } >> diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c >> index fae64bc..370e4f9 100644 >> --- a/drivers/gpu/drm/i915/intel_sdvo.c >> +++ b/drivers/gpu/drm/i915/intel_sdvo.c >> @@ -2071,6 +2071,12 @@ intel_sdvo_set_property(struct drm_connector *connector, >> case DRM_MODE_PICTURE_ASPECT_16_9: >> intel_sdvo->aspect_ratio = HDMI_PICTURE_ASPECT_16_9; >> break; >> + case DRM_MODE_PICTURE_ASPECT_64_27: >> + intel_sdvo->aspect_ratio = HDMI_PICTURE_ASPECT_64_27; >> + break; >> + case DRM_MODE_PICTURE_ASPECT_256_135: >> + intel_sdvo->aspect_ratio = HDMI_PICTURE_ASPECT_256_135; >> + break; >> default: >> return -EINVAL; >> } > > The trouble with the aspect_ratio prop as currently implemented is that we > currently unconditionally overwrite adjusted_mode->picture_aspect_ratio > with it. > > But your patches here move the aspect ratio handling into > drm_mode_modeinfo (uabi) and drm_display_mode (kernel-internal), where it > imo belongs. But we need to figure out how to the interaction with the > property correctly. What's probably needed is a new value in the > aspect_ratio enum called "default", which selects the aspect_ratio from > the mode. Only when userspace overrides (NONE, or one of the CEA aspect > ratios) would we obey the aspect_ratio of the property. Otherwise the > aspect ratio stored in the mode would be lost. This is exactly how we have handled this in Android branch(with NONE as default), thanks for the suggestion. I will incorporate this in next patch set. > > The other bit that I can't find in this series is making sure we compute > the VIC correctly for the new modes. Or does that magically work correctly > since we compare the full mode when selecting VICs? > Yes, we are saving the right VIC from EDID, so the VIC is now a part of the mode flags, all we have to do extract this and write during preparing AVI-IF, we have a small one line patch for that. I will add that too in the next series. > Thanks, Daniel > _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Intel-gfx] [PATCH 5/5] drm/i915: Add support for new aspect ratios 2016-04-22 5:28 ` Sharma, Shashank @ 2016-04-22 8:09 ` Daniel Vetter 0 siblings, 0 replies; 11+ messages in thread From: Daniel Vetter @ 2016-04-22 8:09 UTC (permalink / raw) To: Sharma, Shashank Cc: linux-fbdev, intel-gfx, dri-devel, daniel.vetter, plagnioj On Fri, Apr 22, 2016 at 10:58:34AM +0530, Sharma, Shashank wrote: > Thanks for the review Daniel. > My comments inline. > > Regards > Shashank > On 4/21/2016 8:34 PM, Daniel Vetter wrote: > >On Fri, Mar 25, 2016 at 01:47:35PM +0530, Shashank Sharma wrote: > >>HDMI 2.0/CEA-861-F introduces two new aspect ratios: > >>- 64:27 > >>- 256:135 > >> > >>This patch adds support for these aspect ratios in > >>I915 driver, at various places. > >> > >>Signed-off-by: Shashank Sharma <shashank.sharma@intel.com> > > > >Ok, we discussed this a bit internally and I had some questions. Reading > >this series patches make sense up to this one, but here I have a few > >questions/comments. > > > >>--- > >> drivers/gpu/drm/drm_modes.c | 12 ++++++++++++ > >> drivers/gpu/drm/i915/intel_hdmi.c | 6 ++++++ > >> drivers/gpu/drm/i915/intel_sdvo.c | 6 ++++++ > >> 3 files changed, 24 insertions(+) > >> > >>diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c > >>index 6e66136..11f219a 100644 > >>--- a/drivers/gpu/drm/drm_modes.c > >>+++ b/drivers/gpu/drm/drm_modes.c > >>@@ -1482,6 +1482,12 @@ void drm_mode_convert_to_umode(struct drm_mode_modeinfo *out, > >> case HDMI_PICTURE_ASPECT_16_9: > >> out->flags |= DRM_MODE_FLAG_PAR16_9; > >> break; > >>+ case HDMI_PICTURE_ASPECT_64_27: > >>+ out->flags |= DRM_MODE_FLAG_PAR64_27; > >>+ break; > >>+ case DRM_MODE_PICTURE_ASPECT_256_135: > >>+ out->flags |= DRM_MODE_FLAG_PAR256_135; > >>+ break; > >> case HDMI_PICTURE_ASPECT_NONE: > >> case HDMI_PICTURE_ASPECT_RESERVED: > >> default: > >>@@ -1544,6 +1550,12 @@ int drm_mode_convert_umode(struct drm_display_mode *out, > >> case DRM_MODE_FLAG_PAR16_9: > >> out->picture_aspect_ratio |= HDMI_PICTURE_ASPECT_16_9; > >> break; > >>+ case DRM_MODE_FLAG_PAR64_27: > >>+ out->picture_aspect_ratio |= HDMI_PICTURE_ASPECT_64_27; > >>+ break; > >>+ case DRM_MODE_FLAG_PAR256_135: > >>+ out->picture_aspect_ratio |= HDMI_PICTURE_ASPECT_256_135; > >>+ break; > >> default: > >> out->picture_aspect_ratio = HDMI_PICTURE_ASPECT_NONE; > >> } > > > >Above two parts is core enabling, I guess those should be squashed into > >the preceeding patch? > > > Sure, we can do this. > The idea was to create a separate patch for new aspect ratio, so that one > can segregate HDMI 2.0 patches and HDMI 1.4 patches. If you still recommend > this, I can move this part in next patch. Definitely a good idea, and you have that separate patch already in "drm: Add flags for new aspect ratios". I just think that the above 2 hunks belong into the core patch, not the i915 enabling patch. > >>diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c > >>index e2dab48..bc8e2c8 100644 > >>--- a/drivers/gpu/drm/i915/intel_hdmi.c > >>+++ b/drivers/gpu/drm/i915/intel_hdmi.c > >>@@ -1545,6 +1545,12 @@ intel_hdmi_set_property(struct drm_connector *connector, > >> case DRM_MODE_PICTURE_ASPECT_16_9: > >> intel_hdmi->aspect_ratio = HDMI_PICTURE_ASPECT_16_9; > >> break; > >>+ case DRM_MODE_PICTURE_ASPECT_64_27: > >>+ intel_hdmi->aspect_ratio = HDMI_PICTURE_ASPECT_64_27; > >>+ break; > >>+ case DRM_MODE_PICTURE_ASPECT_256_135: > >>+ intel_hdmi->aspect_ratio = HDMI_PICTURE_ASPECT_256_135; > >>+ break; > >> default: > >> return -EINVAL; > >> } > >>diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c > >>index fae64bc..370e4f9 100644 > >>--- a/drivers/gpu/drm/i915/intel_sdvo.c > >>+++ b/drivers/gpu/drm/i915/intel_sdvo.c > >>@@ -2071,6 +2071,12 @@ intel_sdvo_set_property(struct drm_connector *connector, > >> case DRM_MODE_PICTURE_ASPECT_16_9: > >> intel_sdvo->aspect_ratio = HDMI_PICTURE_ASPECT_16_9; > >> break; > >>+ case DRM_MODE_PICTURE_ASPECT_64_27: > >>+ intel_sdvo->aspect_ratio = HDMI_PICTURE_ASPECT_64_27; > >>+ break; > >>+ case DRM_MODE_PICTURE_ASPECT_256_135: > >>+ intel_sdvo->aspect_ratio = HDMI_PICTURE_ASPECT_256_135; > >>+ break; > >> default: > >> return -EINVAL; > >> } > > > >The trouble with the aspect_ratio prop as currently implemented is that we > >currently unconditionally overwrite adjusted_mode->picture_aspect_ratio > >with it. > > > >But your patches here move the aspect ratio handling into > >drm_mode_modeinfo (uabi) and drm_display_mode (kernel-internal), where it > >imo belongs. But we need to figure out how to the interaction with the > >property correctly. What's probably needed is a new value in the > >aspect_ratio enum called "default", which selects the aspect_ratio from > >the mode. Only when userspace overrides (NONE, or one of the CEA aspect > >ratios) would we obey the aspect_ratio of the property. Otherwise the > >aspect ratio stored in the mode would be lost. > This is exactly how we have handled this in Android branch(with NONE as > default), thanks for the suggestion. I will incorporate this in next patch > set. Yeah, we can't reuse NONE in case someone wants to explicitly have no aspect ratio (which means we'll not transmit the VIC code in the infoframes most likely). At least I think adding a new DEFAULT instead of overloading NONE is the better approach. > >The other bit that I can't find in this series is making sure we compute > >the VIC correctly for the new modes. Or does that magically work correctly > >since we compare the full mode when selecting VICs? > > > Yes, we are saving the right VIC from EDID, so the VIC is now a part of the > mode flags, all we have to do extract this and write during preparing > AVI-IF, we have a small one line patch for that. I will add that too in the > next series. Ah I was a bit unclear. But reading more code it's indeed that we have aspect-ratio already stored in the edid parsing code for the VIC modes in the static table. And with your kernel-mode to umode patches it'll show up in the userspace mode list. And then userspace can request that mode, and umode to kernel-mode will preserve it. And finally we can compute the right VIC from that again. So seems solid, only thing to change is how we take the i915 property into account. On that topic: Do we really need to keep that property, or could we just remove it? I assume the only real user is android, and that's still closed, so we could just nuke it I guess ;-) That would be even simpler. And with the new flags userspace still has the option to override the aspect ratio mode if it wants to. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 11+ messages in thread
* ✗ Fi.CI.BAT: warning for Add aspect ratio parsing (rev3) 2016-03-25 8:17 [PATCH 0/5] Add aspect ratio parsing Shashank Sharma ` (4 preceding siblings ...) 2016-03-25 8:17 ` [PATCH 5/5] drm/i915: Add support " Shashank Sharma @ 2016-03-25 9:32 ` Patchwork 5 siblings, 0 replies; 11+ messages in thread From: Patchwork @ 2016-03-25 9:32 UTC (permalink / raw) To: Shashank Sharma; +Cc: intel-gfx == Series Details == Series: Add aspect ratio parsing (rev3) URL : https://patchwork.freedesktop.org/series/1915/ State : warning == Summary == Series 1915v3 Add aspect ratio parsing http://patchwork.freedesktop.org/api/1.0/series/1915/revisions/3/mbox/ Test gem_exec_suspend: Subgroup basic-s3: pass -> DMESG-WARN (bsw-nuc-2) Test gem_sync: Subgroup basic-render: pass -> INCOMPLETE (bdw-nuci7) UNSTABLE Test kms_flip: Subgroup basic-flip-vs-wf_vblank: pass -> SKIP (hsw-brixbox) Test pm_rpm: Subgroup basic-pci-d3-state: pass -> DMESG-WARN (byt-nuc) Subgroup basic-rte: dmesg-warn -> PASS (byt-nuc) UNSTABLE bdw-nuci7 total:173 pass:161 dwarn:0 dfail:0 fail:1 skip:10 bdw-ultra total:192 pass:170 dwarn:0 dfail:0 fail:1 skip:21 bsw-nuc-2 total:192 pass:154 dwarn:1 dfail:0 fail:0 skip:37 byt-nuc total:192 pass:156 dwarn:1 dfail:0 fail:0 skip:35 hsw-brixbox total:192 pass:169 dwarn:0 dfail:0 fail:0 skip:23 hsw-gt2 total:192 pass:175 dwarn:0 dfail:0 fail:0 skip:17 ivb-t430s total:192 pass:167 dwarn:0 dfail:0 fail:0 skip:25 skl-i7k-2 total:192 pass:169 dwarn:0 dfail:0 fail:0 skip:23 snb-dellxps total:192 pass:158 dwarn:0 dfail:0 fail:0 skip:34 snb-x220t total:192 pass:158 dwarn:0 dfail:0 fail:1 skip:33 Results at /archive/results/CI_IGT_test/Patchwork_1719/ f5d413cccefa1f93d64c34f357151d42add63a84 drm-intel-nightly: 2016y-03m-24d-14h-34m-29s UTC integration manifest 252f383818ab4a2d27d6ae803b442d02b5dce0fa drm/i915: Add support for new aspect ratios ec04b80c5d8c41af580fc86541d9bb7c0ee62bfa drm: Add flags for new aspect ratios 268689f385a5d80f2c222b0c987069a71931e0fd video: Add new aspect ratios for HDMI 2.0 3750467c2f437187ebf47dc6341298443a848ef2 drm: Add aspect ratio parsing in DRM layer d8edd4433f5c14388f962510e770d938a551153b drm: add picture aspect ratio flags _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 0/5]: Add aspect ratio parsing @ 2015-12-17 13:31 Shashank Sharma 2015-12-17 13:31 ` [PATCH 5/5] drm/i915: Add support for new aspect ratios Shashank Sharma 0 siblings, 1 reply; 11+ messages in thread From: Shashank Sharma @ 2015-12-17 13:31 UTC (permalink / raw) To: intel-gfx; +Cc: daniel.vetter Currently DRM framework doesn't parse aspect ratio of a videomode while converting it from a umode->kmode or viceversa. This causes modeset of CEA modes with incorrect aspect ratio. While running HDMI complaince, tests (like 7-27) expect the DUT to apply the mode as per the VIC, but as driver does not consider the aspect ratio part while searching a mode from modedb, we end up setting mode with a wrong VIC, causing the test to fail. What this patch set does: Patch 1-2 - Adds aspect ratio flags in the DRM layer, in form of flags. - Adds parsing of aspect ratio, during conversion of a umode->kmode and viceversa. - Adds aspect ratio check while finding a mode, during modeset. Patch 3-5 - Adds some new aspect ratio defined in CEA-861-F specs to support HDMI 2.0 displays, in DRM and I915 layer. Shashank Sharma (5): drm: add picture aspect ratio flags drm: Add aspect ratio parsing in DRM layer video: Add new aspect ratios for HDMI 2.0 drm: Add flags for new aspect ratios drm/i915: Add support for new aspect ratios drivers/gpu/drm/drm_modes.c | 46 +++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_hdmi.c | 6 +++++ drivers/gpu/drm/i915/intel_sdvo.c | 6 +++++ drivers/video/hdmi.c | 4 ++++ include/linux/hdmi.h | 2 ++ include/uapi/drm/drm_mode.h | 24 +++++++++++++++----- 6 files changed, 83 insertions(+), 5 deletions(-) -- 1.9.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 5/5] drm/i915: Add support for new aspect ratios 2015-12-17 13:31 [PATCH 0/5]: Add aspect ratio parsing Shashank Sharma @ 2015-12-17 13:31 ` Shashank Sharma 0 siblings, 0 replies; 11+ messages in thread From: Shashank Sharma @ 2015-12-17 13:31 UTC (permalink / raw) To: intel-gfx; +Cc: daniel.vetter HDMI 2.0/CEA-861-F introduces two new aspect ratios: - 64:27 - 256:135 This patch adds support for these aspect ratios in I915 driver, at various places. Signed-off-by: Shashank Sharma <shashank.sharma@intel.com> --- drivers/gpu/drm/drm_modes.c | 12 ++++++++++++ drivers/gpu/drm/i915/intel_hdmi.c | 6 ++++++ drivers/gpu/drm/i915/intel_sdvo.c | 6 ++++++ 3 files changed, 24 insertions(+) diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index 7824a63..7e27854 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -1483,6 +1483,12 @@ void drm_mode_convert_to_umode(struct drm_mode_modeinfo *out, case HDMI_PICTURE_ASPECT_16_9: out->flags |= DRM_MODE_FLAG_PAR16_9; break; + case HDMI_PICTURE_ASPECT_64_27: + out->flags |= DRM_MODE_FLAG_PAR64_27; + break; + case DRM_MODE_PICTURE_ASPECT_256_135: + out->flags |= DRM_MODE_FLAG_PAR256_135; + break; case HDMI_PICTURE_ASPECT_NONE: case HDMI_PICTURE_ASPECT_RESERVED: default: @@ -1545,6 +1551,12 @@ int drm_mode_convert_umode(struct drm_display_mode *out, case DRM_MODE_FLAG_PAR16_9: out->picture_aspect_ratio |= HDMI_PICTURE_ASPECT_16_9; break; + case DRM_MODE_FLAG_PAR64_27: + out->picture_aspect_ratio |= HDMI_PICTURE_ASPECT_64_27; + break; + case DRM_MODE_FLAG_PAR256_135: + out->picture_aspect_ratio |= HDMI_PICTURE_ASPECT_256_135; + break; default: out->picture_aspect_ratio = HDMI_PICTURE_ASPECT_NONE; } diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index 6825543..6d5c3ad 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -1533,6 +1533,12 @@ intel_hdmi_set_property(struct drm_connector *connector, case DRM_MODE_PICTURE_ASPECT_16_9: intel_hdmi->aspect_ratio = HDMI_PICTURE_ASPECT_16_9; break; + case DRM_MODE_PICTURE_ASPECT_64_27: + intel_hdmi->aspect_ratio = HDMI_PICTURE_ASPECT_64_27; + break; + case DRM_MODE_PICTURE_ASPECT_256_135: + intel_hdmi->aspect_ratio = HDMI_PICTURE_ASPECT_256_135; + break; default: return -EINVAL; } diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index 2e1da06..83f30d6 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c @@ -2069,6 +2069,12 @@ intel_sdvo_set_property(struct drm_connector *connector, case DRM_MODE_PICTURE_ASPECT_16_9: intel_sdvo->aspect_ratio = HDMI_PICTURE_ASPECT_16_9; break; + case DRM_MODE_PICTURE_ASPECT_64_27: + intel_sdvo->aspect_ratio = HDMI_PICTURE_ASPECT_64_27; + break; + case DRM_MODE_PICTURE_ASPECT_256_135: + intel_sdvo->aspect_ratio = HDMI_PICTURE_ASPECT_256_135; + break; default: return -EINVAL; } -- 1.9.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2016-04-22 8:09 UTC | newest] Thread overview: 11+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-03-25 8:17 [PATCH 0/5] Add aspect ratio parsing Shashank Sharma 2016-03-25 8:17 ` [PATCH 1/5] drm: add picture aspect ratio flags Shashank Sharma 2016-03-25 8:17 ` [PATCH 2/5] drm: Add aspect ratio parsing in DRM layer Shashank Sharma 2016-03-25 8:17 ` [PATCH 3/5] video: Add new aspect ratios for HDMI 2.0 Shashank Sharma 2016-03-25 8:17 ` [PATCH 4/5] drm: Add flags for new aspect ratios Shashank Sharma 2016-03-25 8:17 ` [PATCH 5/5] drm/i915: Add support " Shashank Sharma 2016-04-21 15:04 ` Daniel Vetter 2016-04-22 5:28 ` Sharma, Shashank 2016-04-22 8:09 ` [Intel-gfx] " Daniel Vetter 2016-03-25 9:32 ` ✗ Fi.CI.BAT: warning for Add aspect ratio parsing (rev3) Patchwork -- strict thread matches above, loose matches on Subject: below -- 2015-12-17 13:31 [PATCH 0/5]: Add aspect ratio parsing Shashank Sharma 2015-12-17 13:31 ` [PATCH 5/5] drm/i915: Add support for new aspect ratios Shashank Sharma
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).