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.kan...@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,
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
