| Message ID | 1400757650-28636-1-git-send-email-vandana.kannan@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, May 22, 2014 at 04:50:48PM +0530, Vandana Kannan wrote: > Added a property to enable user space to set aspect ratio. > This patch contains declaration of the property and code to create the > property. > > Signed-off-by: Vandana Kannan <vandana.kannan@intel.com> > Cc: dri-devel@lists.freedesktop.org > --- > drivers/gpu/drm/drm_crtc.c | 31 +++++++++++++++++++++++++++++++ > include/drm/drm_crtc.h | 2 ++ > 2 files changed, 33 insertions(+) > > diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c > index 37a3e07..84d359e 100644 > --- a/drivers/gpu/drm/drm_crtc.c > +++ b/drivers/gpu/drm/drm_crtc.c > @@ -139,6 +139,12 @@ static const struct drm_prop_enum_list drm_scaling_mode_enum_list[] = > { DRM_MODE_SCALE_ASPECT, "Full aspect" }, > }; > > +static const struct drm_prop_enum_list drm_aspect_ratio_enum_list[] = { > + { HDMI_PICTURE_ASPECT_NONE, "Automatic" }, > + { HDMI_PICTURE_ASPECT_4_3, "4:3" }, > + { HDMI_PICTURE_ASPECT_16_9, "16:9" }, > +}; This seems like it should be either an HDMI specific property, since it uses values defined by HDMI/CEA. Alternatively we could introduce some new generic enumeration and translate that to the HDMI/CEA equivalent in the AVI infoframe helpers. Doing so would allow us to add aspect ratios different from what HDMI or CEA define. > /* > * Non-global properties, but "required" for certain connectors. > */ > @@ -1344,6 +1350,31 @@ int drm_mode_create_scaling_mode_property(struct drm_device *dev) > EXPORT_SYMBOL(drm_mode_create_scaling_mode_property); > > /** > + * drm_mode_create_aspect_ratio_property - create aspect ratio property > + * @dev: DRM device > + * > + * Called by a driver the first time it's needed, must be attached to desired > + * connectors. > + */ > +int drm_mode_create_aspect_ratio_property(struct drm_device *dev) > +{ > + struct drm_property *aspect_ratio; > + > + if (dev->mode_config.aspect_ratio_property) > + return 0; > + > + aspect_ratio = > + drm_property_create_enum(dev, 0, "aspect ratio", > + drm_aspect_ratio_enum_list, > + ARRAY_SIZE(drm_aspect_ratio_enum_list)); > + > + dev->mode_config.aspect_ratio_property = aspect_ratio; I don't think you need the temporary aspect_ratio variable here. Can't you directly assign the new property to .aspect_ratio_property? Thierry
On Thu, May 22, 2014 at 04:50:48PM +0530, Vandana Kannan wrote: > Added a property to enable user space to set aspect ratio. > This patch contains declaration of the property and code to create the > property. > > Signed-off-by: Vandana Kannan <vandana.kannan@intel.com> > Cc: dri-devel@lists.freedesktop.org Documentation update is missing. Also for such patch series I recommend to post the entire patch series to dri-devel and intel-gfx. Otherwise people on dri-devel don't see how the new code is used and so can't really review it properly. -Daniel > --- > drivers/gpu/drm/drm_crtc.c | 31 +++++++++++++++++++++++++++++++ > include/drm/drm_crtc.h | 2 ++ > 2 files changed, 33 insertions(+) > > diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c > index 37a3e07..84d359e 100644 > --- a/drivers/gpu/drm/drm_crtc.c > +++ b/drivers/gpu/drm/drm_crtc.c > @@ -139,6 +139,12 @@ static const struct drm_prop_enum_list drm_scaling_mode_enum_list[] = > { DRM_MODE_SCALE_ASPECT, "Full aspect" }, > }; > > +static const struct drm_prop_enum_list drm_aspect_ratio_enum_list[] = { > + { HDMI_PICTURE_ASPECT_NONE, "Automatic" }, > + { HDMI_PICTURE_ASPECT_4_3, "4:3" }, > + { HDMI_PICTURE_ASPECT_16_9, "16:9" }, > +}; > + > /* > * Non-global properties, but "required" for certain connectors. > */ > @@ -1344,6 +1350,31 @@ int drm_mode_create_scaling_mode_property(struct drm_device *dev) > EXPORT_SYMBOL(drm_mode_create_scaling_mode_property); > > /** > + * drm_mode_create_aspect_ratio_property - create aspect ratio property > + * @dev: DRM device > + * > + * Called by a driver the first time it's needed, must be attached to desired > + * connectors. > + */ > +int drm_mode_create_aspect_ratio_property(struct drm_device *dev) > +{ > + struct drm_property *aspect_ratio; > + > + if (dev->mode_config.aspect_ratio_property) > + return 0; > + > + aspect_ratio = > + drm_property_create_enum(dev, 0, "aspect ratio", > + drm_aspect_ratio_enum_list, > + ARRAY_SIZE(drm_aspect_ratio_enum_list)); > + > + dev->mode_config.aspect_ratio_property = aspect_ratio; > + > + return 0; > +} > +EXPORT_SYMBOL(drm_mode_create_aspect_ratio_property); > + > +/** > * drm_mode_create_dirty_property - create dirty property > * @dev: DRM device > * > diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h > index 5c1c31c..1149617 100644 > --- a/include/drm/drm_crtc.h > +++ b/include/drm/drm_crtc.h > @@ -801,6 +801,7 @@ struct drm_mode_config { > > /* Optional properties */ > struct drm_property *scaling_mode_property; > + struct drm_property *aspect_ratio_property; > struct drm_property *dirty_info_property; > > /* dumb ioctl parameters */ > @@ -971,6 +972,7 @@ extern int drm_mode_create_dvi_i_properties(struct drm_device *dev); > extern int drm_mode_create_tv_properties(struct drm_device *dev, int num_formats, > char *formats[]); > extern int drm_mode_create_scaling_mode_property(struct drm_device *dev); > +extern int drm_mode_create_aspect_ratio_property(struct drm_device *dev); > extern int drm_mode_create_dirty_info_property(struct drm_device *dev); > extern const char *drm_get_encoder_name(const struct drm_encoder *encoder); > > -- > 1.9.3 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Adding dri-devel.. On May-22-2014 4:50 PM, Kannan, Vandana wrote: > Create and attach the drm property to set aspect ratio. If there is no user > specified value, then PAR_NONE/Automatic option is set by default. User can > select aspect ratio 4:3 or 16:9. The aspect ratio selected by user would > come into effect with a mode set. > > Signed-off-by: Vandana Kannan <vandana.kannan@intel.com> > --- > drivers/gpu/drm/i915/i915_drv.h | 5 +++++ > drivers/gpu/drm/i915/intel_drv.h | 1 + > drivers/gpu/drm/i915/intel_hdmi.c | 31 +++++++++++++++++++++++++++++++ > 3 files changed, 37 insertions(+) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 13495a4..8dc5f59 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -2691,6 +2691,11 @@ int vlv_freq_opcode(struct drm_i915_private *dev_priv, int val); > #define INTEL_BROADCAST_RGB_FULL 1 > #define INTEL_BROADCAST_RGB_LIMITED 2 > > +/* Aspect ratio property */ > +#define INTEL_ASPECT_RATIO_AUTO 0 > +#define INTEL_ASPECT_RATIO_4_3 1 > +#define INTEL_ASPECT_RATIO_16_9 2 > + > static inline uint32_t i915_vgacntrl_reg(struct drm_device *dev) > { > if (HAS_PCH_SPLIT(dev)) > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > index 287b89e..f9f19b6 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -488,6 +488,7 @@ struct intel_hdmi { > bool has_audio; > enum hdmi_force_audio force_audio; > bool rgb_quant_range_selectable; > + enum hdmi_picture_aspect aspect_ratio; > void (*write_infoframe)(struct drm_encoder *encoder, > enum hdmi_infoframe_type type, > const void *frame, ssize_t len); > diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c > index 171d0dd..2c6aa76 100644 > --- a/drivers/gpu/drm/i915/intel_hdmi.c > +++ b/drivers/gpu/drm/i915/intel_hdmi.c > @@ -367,6 +367,9 @@ static void intel_hdmi_set_avi_infoframe(struct drm_encoder *encoder, > union hdmi_infoframe frame; > int ret; > > + /* Set user selected PAR to incoming mode's member */ > + adjusted_mode->picture_aspect_ratio = intel_hdmi->aspect_ratio; > + > ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, > adjusted_mode); > if (ret < 0) { > @@ -1124,6 +1127,23 @@ intel_hdmi_set_property(struct drm_connector *connector, > goto done; > } > > + if (property == connector->dev->mode_config.aspect_ratio_property) { > + switch (val) { > + case INTEL_ASPECT_RATIO_AUTO: > + intel_hdmi->aspect_ratio = HDMI_PICTURE_ASPECT_NONE; > + break; > + case INTEL_ASPECT_RATIO_4_3: > + intel_hdmi->aspect_ratio = HDMI_PICTURE_ASPECT_4_3; > + break; > + case INTEL_ASPECT_RATIO_16_9: > + intel_hdmi->aspect_ratio = HDMI_PICTURE_ASPECT_16_9; > + break; > + default: > + return -EINVAL; > + } > + goto done; > + } > + > return -EINVAL; > > done: > @@ -1416,11 +1436,22 @@ static const struct drm_encoder_funcs intel_hdmi_enc_funcs = { > }; > > static void > +intel_attach_aspect_ratio_property(struct drm_connector *connector) > +{ > + drm_mode_create_aspect_ratio_property(connector->dev); > + drm_object_attach_property(&connector->base, > + connector->dev->mode_config.aspect_ratio_property, > + HDMI_PICTURE_ASPECT_NONE); > +} > + > +static void > intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *connector) > { > intel_attach_force_audio_property(connector); > intel_attach_broadcast_rgb_property(connector); > intel_hdmi->color_range_auto = true; > + intel_attach_aspect_ratio_property(connector); > + intel_hdmi->aspect_ratio = HDMI_PICTURE_ASPECT_NONE; > } > > void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, >
On May-22-2014 5:08 PM, Thierry Reding wrote: > On Thu, May 22, 2014 at 04:50:48PM +0530, Vandana Kannan wrote: >> Added a property to enable user space to set aspect ratio. >> This patch contains declaration of the property and code to create the >> property. >> >> Signed-off-by: Vandana Kannan <vandana.kannan@intel.com> >> Cc: dri-devel@lists.freedesktop.org >> --- >> drivers/gpu/drm/drm_crtc.c | 31 +++++++++++++++++++++++++++++++ >> include/drm/drm_crtc.h | 2 ++ >> 2 files changed, 33 insertions(+) >> >> diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c >> index 37a3e07..84d359e 100644 >> --- a/drivers/gpu/drm/drm_crtc.c >> +++ b/drivers/gpu/drm/drm_crtc.c >> @@ -139,6 +139,12 @@ static const struct drm_prop_enum_list drm_scaling_mode_enum_list[] = >> { DRM_MODE_SCALE_ASPECT, "Full aspect" }, >> }; >> >> +static const struct drm_prop_enum_list drm_aspect_ratio_enum_list[] = { >> + { HDMI_PICTURE_ASPECT_NONE, "Automatic" }, >> + { HDMI_PICTURE_ASPECT_4_3, "4:3" }, >> + { HDMI_PICTURE_ASPECT_16_9, "16:9" }, >> +}; > > This seems like it should be either an HDMI specific property, since it > uses values defined by HDMI/CEA. Alternatively we could introduce some > new generic enumeration and translate that to the HDMI/CEA equivalent in > the AVI infoframe helpers. > > Doing so would allow us to add aspect ratios different from what HDMI or > CEA define. > >> /* >> * Non-global properties, but "required" for certain connectors. >> */ >> @@ -1344,6 +1350,31 @@ int drm_mode_create_scaling_mode_property(struct drm_device *dev) >> EXPORT_SYMBOL(drm_mode_create_scaling_mode_property); >> >> /** >> + * drm_mode_create_aspect_ratio_property - create aspect ratio property >> + * @dev: DRM device >> + * >> + * Called by a driver the first time it's needed, must be attached to desired >> + * connectors. >> + */ >> +int drm_mode_create_aspect_ratio_property(struct drm_device *dev) >> +{ >> + struct drm_property *aspect_ratio; >> + >> + if (dev->mode_config.aspect_ratio_property) >> + return 0; >> + >> + aspect_ratio = >> + drm_property_create_enum(dev, 0, "aspect ratio", >> + drm_aspect_ratio_enum_list, >> + ARRAY_SIZE(drm_aspect_ratio_enum_list)); >> + >> + dev->mode_config.aspect_ratio_property = aspect_ratio; > > I don't think you need the temporary aspect_ratio variable here. Can't > you directly assign the new property to .aspect_ratio_property? > > Thierry > Thanks for your inputs. I will make the following changes and resend the patch.. - Make the enum generic and translate that to the HDMI/CEA equivalent for AVI IF. - Remove the temporary aspect_ratio variable. Thanks, Vandana
On May-22-2014 5:46 PM, Daniel Vetter wrote: > On Thu, May 22, 2014 at 04:50:48PM +0530, Vandana Kannan wrote: >> Added a property to enable user space to set aspect ratio. >> This patch contains declaration of the property and code to create the >> property. >> >> Signed-off-by: Vandana Kannan <vandana.kannan@intel.com> >> Cc: dri-devel@lists.freedesktop.org > > Documentation update is missing. Also for such patch series I recommend to > post the entire patch series to dri-devel and intel-gfx. Otherwise people > on dri-devel don't see how the new code is used and so can't really review > it properly. > -Daniel > Thanks for your inputs. I will send the Documentation change along with the rest of the patches (when I resend them). Resent patch 3 adding dri-devel.. Thanks, Vandana >> --- >> drivers/gpu/drm/drm_crtc.c | 31 +++++++++++++++++++++++++++++++ >> include/drm/drm_crtc.h | 2 ++ >> 2 files changed, 33 insertions(+) >> >> diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c >> index 37a3e07..84d359e 100644 >> --- a/drivers/gpu/drm/drm_crtc.c >> +++ b/drivers/gpu/drm/drm_crtc.c >> @@ -139,6 +139,12 @@ static const struct drm_prop_enum_list drm_scaling_mode_enum_list[] = >> { DRM_MODE_SCALE_ASPECT, "Full aspect" }, >> }; >> >> +static const struct drm_prop_enum_list drm_aspect_ratio_enum_list[] = { >> + { HDMI_PICTURE_ASPECT_NONE, "Automatic" }, >> + { HDMI_PICTURE_ASPECT_4_3, "4:3" }, >> + { HDMI_PICTURE_ASPECT_16_9, "16:9" }, >> +}; >> + >> /* >> * Non-global properties, but "required" for certain connectors. >> */ >> @@ -1344,6 +1350,31 @@ int drm_mode_create_scaling_mode_property(struct drm_device *dev) >> EXPORT_SYMBOL(drm_mode_create_scaling_mode_property); >> >> /** >> + * drm_mode_create_aspect_ratio_property - create aspect ratio property >> + * @dev: DRM device >> + * >> + * Called by a driver the first time it's needed, must be attached to desired >> + * connectors. >> + */ >> +int drm_mode_create_aspect_ratio_property(struct drm_device *dev) >> +{ >> + struct drm_property *aspect_ratio; >> + >> + if (dev->mode_config.aspect_ratio_property) >> + return 0; >> + >> + aspect_ratio = >> + drm_property_create_enum(dev, 0, "aspect ratio", >> + drm_aspect_ratio_enum_list, >> + ARRAY_SIZE(drm_aspect_ratio_enum_list)); >> + >> + dev->mode_config.aspect_ratio_property = aspect_ratio; >> + >> + return 0; >> +} >> +EXPORT_SYMBOL(drm_mode_create_aspect_ratio_property); >> + >> +/** >> * drm_mode_create_dirty_property - create dirty property >> * @dev: DRM device >> * >> diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h >> index 5c1c31c..1149617 100644 >> --- a/include/drm/drm_crtc.h >> +++ b/include/drm/drm_crtc.h >> @@ -801,6 +801,7 @@ struct drm_mode_config { >> >> /* Optional properties */ >> struct drm_property *scaling_mode_property; >> + struct drm_property *aspect_ratio_property; >> struct drm_property *dirty_info_property; >> >> /* dumb ioctl parameters */ >> @@ -971,6 +972,7 @@ extern int drm_mode_create_dvi_i_properties(struct drm_device *dev); >> extern int drm_mode_create_tv_properties(struct drm_device *dev, int num_formats, >> char *formats[]); >> extern int drm_mode_create_scaling_mode_property(struct drm_device *dev); >> +extern int drm_mode_create_aspect_ratio_property(struct drm_device *dev); >> extern int drm_mode_create_dirty_info_property(struct drm_device *dev); >> extern const char *drm_get_encoder_name(const struct drm_encoder *encoder); >> >> -- >> 1.9.3 >> >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/intel-gfx >
On May-23-2014 4:18 PM, Vandana Kannan wrote: > On May-22-2014 5:46 PM, Daniel Vetter wrote: >> On Thu, May 22, 2014 at 04:50:48PM +0530, Vandana Kannan wrote: >>> Added a property to enable user space to set aspect ratio. >>> This patch contains declaration of the property and code to create the >>> property. >>> >>> Signed-off-by: Vandana Kannan <vandana.kannan@intel.com> >>> Cc: dri-devel@lists.freedesktop.org >> >> Documentation update is missing. Also for such patch series I recommend to >> post the entire patch series to dri-devel and intel-gfx. Otherwise people >> on dri-devel don't see how the new code is used and so can't really review >> it properly. >> -Daniel >> > Thanks for your inputs. > I will send the Documentation change along with the rest of the patches > (when I resend them). > Resent patch 3 adding dri-devel.. > > Thanks, > Vandana Hi Daniel, For the Documentation update, should HTML table format be used in drm.tmpl or is there some other method? -Vandana >>> --- >>> drivers/gpu/drm/drm_crtc.c | 31 +++++++++++++++++++++++++++++++ >>> include/drm/drm_crtc.h | 2 ++ >>> 2 files changed, 33 insertions(+) >>> >>> diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c >>> index 37a3e07..84d359e 100644 >>> --- a/drivers/gpu/drm/drm_crtc.c >>> +++ b/drivers/gpu/drm/drm_crtc.c >>> @@ -139,6 +139,12 @@ static const struct drm_prop_enum_list drm_scaling_mode_enum_list[] = >>> { DRM_MODE_SCALE_ASPECT, "Full aspect" }, >>> }; >>> >>> +static const struct drm_prop_enum_list drm_aspect_ratio_enum_list[] = { >>> + { HDMI_PICTURE_ASPECT_NONE, "Automatic" }, >>> + { HDMI_PICTURE_ASPECT_4_3, "4:3" }, >>> + { HDMI_PICTURE_ASPECT_16_9, "16:9" }, >>> +}; >>> + >>> /* >>> * Non-global properties, but "required" for certain connectors. >>> */ >>> @@ -1344,6 +1350,31 @@ int drm_mode_create_scaling_mode_property(struct drm_device *dev) >>> EXPORT_SYMBOL(drm_mode_create_scaling_mode_property); >>> >>> /** >>> + * drm_mode_create_aspect_ratio_property - create aspect ratio property >>> + * @dev: DRM device >>> + * >>> + * Called by a driver the first time it's needed, must be attached to desired >>> + * connectors. >>> + */ >>> +int drm_mode_create_aspect_ratio_property(struct drm_device *dev) >>> +{ >>> + struct drm_property *aspect_ratio; >>> + >>> + if (dev->mode_config.aspect_ratio_property) >>> + return 0; >>> + >>> + aspect_ratio = >>> + drm_property_create_enum(dev, 0, "aspect ratio", >>> + drm_aspect_ratio_enum_list, >>> + ARRAY_SIZE(drm_aspect_ratio_enum_list)); >>> + >>> + dev->mode_config.aspect_ratio_property = aspect_ratio; >>> + >>> + return 0; >>> +} >>> +EXPORT_SYMBOL(drm_mode_create_aspect_ratio_property); >>> + >>> +/** >>> * drm_mode_create_dirty_property - create dirty property >>> * @dev: DRM device >>> * >>> diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h >>> index 5c1c31c..1149617 100644 >>> --- a/include/drm/drm_crtc.h >>> +++ b/include/drm/drm_crtc.h >>> @@ -801,6 +801,7 @@ struct drm_mode_config { >>> >>> /* Optional properties */ >>> struct drm_property *scaling_mode_property; >>> + struct drm_property *aspect_ratio_property; >>> struct drm_property *dirty_info_property; >>> >>> /* dumb ioctl parameters */ >>> @@ -971,6 +972,7 @@ extern int drm_mode_create_dvi_i_properties(struct drm_device *dev); >>> extern int drm_mode_create_tv_properties(struct drm_device *dev, int num_formats, >>> char *formats[]); >>> extern int drm_mode_create_scaling_mode_property(struct drm_device *dev); >>> +extern int drm_mode_create_aspect_ratio_property(struct drm_device *dev); >>> extern int drm_mode_create_dirty_info_property(struct drm_device *dev); >>> extern const char *drm_get_encoder_name(const struct drm_encoder *encoder); >>> >>> -- >>> 1.9.3 >>> >>> _______________________________________________ >>> Intel-gfx mailing list >>> Intel-gfx@lists.freedesktop.org >>> http://lists.freedesktop.org/mailman/listinfo/intel-gfx >> > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx >
On Mon, May 26, 2014 at 11:00:41AM +0530, Vandana Kannan wrote: > On May-23-2014 4:18 PM, Vandana Kannan wrote: > > On May-22-2014 5:46 PM, Daniel Vetter wrote: > >> On Thu, May 22, 2014 at 04:50:48PM +0530, Vandana Kannan wrote: > >>> Added a property to enable user space to set aspect ratio. > >>> This patch contains declaration of the property and code to create the > >>> property. > >>> > >>> Signed-off-by: Vandana Kannan <vandana.kannan@intel.com> > >>> Cc: dri-devel@lists.freedesktop.org > >> > >> Documentation update is missing. Also for such patch series I recommend to > >> post the entire patch series to dri-devel and intel-gfx. Otherwise people > >> on dri-devel don't see how the new code is used and so can't really review > >> it properly. > >> -Daniel > >> > > Thanks for your inputs. > > I will send the Documentation change along with the rest of the patches > > (when I resend them). > > Resent patch 3 adding dri-devel.. > > > > Thanks, > > Vandana > > Hi Daniel, > For the Documentation update, should HTML table format be used in > drm.tmpl or is there some other method? Currently we only have the html table. -Daniel > -Vandana > >>> --- > >>> drivers/gpu/drm/drm_crtc.c | 31 +++++++++++++++++++++++++++++++ > >>> include/drm/drm_crtc.h | 2 ++ > >>> 2 files changed, 33 insertions(+) > >>> > >>> diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c > >>> index 37a3e07..84d359e 100644 > >>> --- a/drivers/gpu/drm/drm_crtc.c > >>> +++ b/drivers/gpu/drm/drm_crtc.c > >>> @@ -139,6 +139,12 @@ static const struct drm_prop_enum_list drm_scaling_mode_enum_list[] = > >>> { DRM_MODE_SCALE_ASPECT, "Full aspect" }, > >>> }; > >>> > >>> +static const struct drm_prop_enum_list drm_aspect_ratio_enum_list[] = { > >>> + { HDMI_PICTURE_ASPECT_NONE, "Automatic" }, > >>> + { HDMI_PICTURE_ASPECT_4_3, "4:3" }, > >>> + { HDMI_PICTURE_ASPECT_16_9, "16:9" }, > >>> +}; > >>> + > >>> /* > >>> * Non-global properties, but "required" for certain connectors. > >>> */ > >>> @@ -1344,6 +1350,31 @@ int drm_mode_create_scaling_mode_property(struct drm_device *dev) > >>> EXPORT_SYMBOL(drm_mode_create_scaling_mode_property); > >>> > >>> /** > >>> + * drm_mode_create_aspect_ratio_property - create aspect ratio property > >>> + * @dev: DRM device > >>> + * > >>> + * Called by a driver the first time it's needed, must be attached to desired > >>> + * connectors. > >>> + */ > >>> +int drm_mode_create_aspect_ratio_property(struct drm_device *dev) > >>> +{ > >>> + struct drm_property *aspect_ratio; > >>> + > >>> + if (dev->mode_config.aspect_ratio_property) > >>> + return 0; > >>> + > >>> + aspect_ratio = > >>> + drm_property_create_enum(dev, 0, "aspect ratio", > >>> + drm_aspect_ratio_enum_list, > >>> + ARRAY_SIZE(drm_aspect_ratio_enum_list)); > >>> + > >>> + dev->mode_config.aspect_ratio_property = aspect_ratio; > >>> + > >>> + return 0; > >>> +} > >>> +EXPORT_SYMBOL(drm_mode_create_aspect_ratio_property); > >>> + > >>> +/** > >>> * drm_mode_create_dirty_property - create dirty property > >>> * @dev: DRM device > >>> * > >>> diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h > >>> index 5c1c31c..1149617 100644 > >>> --- a/include/drm/drm_crtc.h > >>> +++ b/include/drm/drm_crtc.h > >>> @@ -801,6 +801,7 @@ struct drm_mode_config { > >>> > >>> /* Optional properties */ > >>> struct drm_property *scaling_mode_property; > >>> + struct drm_property *aspect_ratio_property; > >>> struct drm_property *dirty_info_property; > >>> > >>> /* dumb ioctl parameters */ > >>> @@ -971,6 +972,7 @@ extern int drm_mode_create_dvi_i_properties(struct drm_device *dev); > >>> extern int drm_mode_create_tv_properties(struct drm_device *dev, int num_formats, > >>> char *formats[]); > >>> extern int drm_mode_create_scaling_mode_property(struct drm_device *dev); > >>> +extern int drm_mode_create_aspect_ratio_property(struct drm_device *dev); > >>> extern int drm_mode_create_dirty_info_property(struct drm_device *dev); > >>> extern const char *drm_get_encoder_name(const struct drm_encoder *encoder); > >>> > >>> -- > >>> 1.9.3 > >>> > >>> _______________________________________________ > >>> Intel-gfx mailing list > >>> Intel-gfx@lists.freedesktop.org > >>> http://lists.freedesktop.org/mailman/listinfo/intel-gfx > >> > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx > > >
Daniel, looks like this series has some r-bs; iirc this fixed some Asus HDMI monitors too (and who knows how many TVs). Jesse On Thu, 22 May 2014 16:50:48 +0530 Vandana Kannan <vandana.kannan@intel.com> wrote: > Added a property to enable user space to set aspect ratio. > This patch contains declaration of the property and code to create the > property. > > Signed-off-by: Vandana Kannan <vandana.kannan@intel.com> > Cc: dri-devel@lists.freedesktop.org > --- > drivers/gpu/drm/drm_crtc.c | 31 +++++++++++++++++++++++++++++++ > include/drm/drm_crtc.h | 2 ++ > 2 files changed, 33 insertions(+) > > diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c > index 37a3e07..84d359e 100644 > --- a/drivers/gpu/drm/drm_crtc.c > +++ b/drivers/gpu/drm/drm_crtc.c > @@ -139,6 +139,12 @@ static const struct drm_prop_enum_list drm_scaling_mode_enum_list[] = > { DRM_MODE_SCALE_ASPECT, "Full aspect" }, > }; > > +static const struct drm_prop_enum_list drm_aspect_ratio_enum_list[] = { > + { HDMI_PICTURE_ASPECT_NONE, "Automatic" }, > + { HDMI_PICTURE_ASPECT_4_3, "4:3" }, > + { HDMI_PICTURE_ASPECT_16_9, "16:9" }, > +}; > + > /* > * Non-global properties, but "required" for certain connectors. > */ > @@ -1344,6 +1350,31 @@ int drm_mode_create_scaling_mode_property(struct drm_device *dev) > EXPORT_SYMBOL(drm_mode_create_scaling_mode_property); > > /** > + * drm_mode_create_aspect_ratio_property - create aspect ratio property > + * @dev: DRM device > + * > + * Called by a driver the first time it's needed, must be attached to desired > + * connectors. > + */ > +int drm_mode_create_aspect_ratio_property(struct drm_device *dev) > +{ > + struct drm_property *aspect_ratio; > + > + if (dev->mode_config.aspect_ratio_property) > + return 0; > + > + aspect_ratio = > + drm_property_create_enum(dev, 0, "aspect ratio", > + drm_aspect_ratio_enum_list, > + ARRAY_SIZE(drm_aspect_ratio_enum_list)); > + > + dev->mode_config.aspect_ratio_property = aspect_ratio; > + > + return 0; > +} > +EXPORT_SYMBOL(drm_mode_create_aspect_ratio_property); > + > +/** > * drm_mode_create_dirty_property - create dirty property > * @dev: DRM device > * > diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h > index 5c1c31c..1149617 100644 > --- a/include/drm/drm_crtc.h > +++ b/include/drm/drm_crtc.h > @@ -801,6 +801,7 @@ struct drm_mode_config { > > /* Optional properties */ > struct drm_property *scaling_mode_property; > + struct drm_property *aspect_ratio_property; > struct drm_property *dirty_info_property; > > /* dumb ioctl parameters */ > @@ -971,6 +972,7 @@ extern int drm_mode_create_dvi_i_properties(struct drm_device *dev); > extern int drm_mode_create_tv_properties(struct drm_device *dev, int num_formats, > char *formats[]); > extern int drm_mode_create_scaling_mode_property(struct drm_device *dev); > +extern int drm_mode_create_aspect_ratio_property(struct drm_device *dev); > extern int drm_mode_create_dirty_info_property(struct drm_device *dev); > extern const char *drm_get_encoder_name(const struct drm_encoder *encoder); >
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 37a3e07..84d359e 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -139,6 +139,12 @@ static const struct drm_prop_enum_list drm_scaling_mode_enum_list[] = { DRM_MODE_SCALE_ASPECT, "Full aspect" }, }; +static const struct drm_prop_enum_list drm_aspect_ratio_enum_list[] = { + { HDMI_PICTURE_ASPECT_NONE, "Automatic" }, + { HDMI_PICTURE_ASPECT_4_3, "4:3" }, + { HDMI_PICTURE_ASPECT_16_9, "16:9" }, +}; + /* * Non-global properties, but "required" for certain connectors. */ @@ -1344,6 +1350,31 @@ int drm_mode_create_scaling_mode_property(struct drm_device *dev) EXPORT_SYMBOL(drm_mode_create_scaling_mode_property); /** + * drm_mode_create_aspect_ratio_property - create aspect ratio property + * @dev: DRM device + * + * Called by a driver the first time it's needed, must be attached to desired + * connectors. + */ +int drm_mode_create_aspect_ratio_property(struct drm_device *dev) +{ + struct drm_property *aspect_ratio; + + if (dev->mode_config.aspect_ratio_property) + return 0; + + aspect_ratio = + drm_property_create_enum(dev, 0, "aspect ratio", + drm_aspect_ratio_enum_list, + ARRAY_SIZE(drm_aspect_ratio_enum_list)); + + dev->mode_config.aspect_ratio_property = aspect_ratio; + + return 0; +} +EXPORT_SYMBOL(drm_mode_create_aspect_ratio_property); + +/** * drm_mode_create_dirty_property - create dirty property * @dev: DRM device * diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 5c1c31c..1149617 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -801,6 +801,7 @@ struct drm_mode_config { /* Optional properties */ struct drm_property *scaling_mode_property; + struct drm_property *aspect_ratio_property; struct drm_property *dirty_info_property; /* dumb ioctl parameters */ @@ -971,6 +972,7 @@ extern int drm_mode_create_dvi_i_properties(struct drm_device *dev); extern int drm_mode_create_tv_properties(struct drm_device *dev, int num_formats, char *formats[]); extern int drm_mode_create_scaling_mode_property(struct drm_device *dev); +extern int drm_mode_create_aspect_ratio_property(struct drm_device *dev); extern int drm_mode_create_dirty_info_property(struct drm_device *dev); extern const char *drm_get_encoder_name(const struct drm_encoder *encoder);
Added a property to enable user space to set aspect ratio. This patch contains declaration of the property and code to create the property. Signed-off-by: Vandana Kannan <vandana.kannan@intel.com> Cc: dri-devel@lists.freedesktop.org --- drivers/gpu/drm/drm_crtc.c | 31 +++++++++++++++++++++++++++++++ include/drm/drm_crtc.h | 2 ++ 2 files changed, 33 insertions(+)