Re: [PATCH 5/7] drm/i915: Init infoframe vfuncs for DP encoders as well

["Sharma, Shashank" <shashank.sharma@intel.com>]

Reviewed-by: Shashank Sharma

Regards
Shashank

On 6/3/2016 1:25 AM, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> DP ports may want to use the video DIP for SDP transmission, so let's
> initiialize the vfuncs for DP encoders as well. The only exception is
> port A eDP prior to HSW as that one doesn't have a video DIP instance.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
>   drivers/gpu/drm/i915/intel_ddi.c  |  2 ++
>   drivers/gpu/drm/i915/intel_dp.c   |  3 +++
>   drivers/gpu/drm/i915/intel_drv.h  |  1 +
>   drivers/gpu/drm/i915/intel_hdmi.c | 51 ++++++++++++++++++++++-----------------
>   4 files changed, 35 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index 3a882a979e5d..c5611e9d9b9c 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -2392,6 +2392,8 @@ void intel_ddi_init(struct drm_device *dev, enum port port)
>   	intel_encoder->crtc_mask = (1 << 0) | (1 << 1) | (1 << 2);
>   	intel_encoder->cloneable = 0;
>
> +	intel_infoframe_init(intel_dig_port);
> +
>   	if (init_dp) {
>   		if (!intel_ddi_init_dp_connector(intel_dig_port))
>   			goto err;
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index f97cd5305e4c..a2d0ee363307 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -5637,6 +5637,9 @@ bool intel_dp_init(struct drm_device *dev,
>   	intel_dig_port->hpd_pulse = intel_dp_hpd_pulse;
>   	dev_priv->hotplug.irq_port[port] = intel_dig_port;
>
> +	if (port != PORT_A)
> +		intel_infoframe_init(intel_dig_port);
> +
>   	if (!intel_dp_init_connector(intel_dig_port, intel_connector))
>   		goto err_init_connector;
>
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index a607799b7776..4c8451e3d8f1 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -1445,6 +1445,7 @@ struct intel_hdmi *enc_to_intel_hdmi(struct drm_encoder *encoder);
>   bool intel_hdmi_compute_config(struct intel_encoder *encoder,
>   			       struct intel_crtc_state *pipe_config);
>   void intel_dp_dual_mode_set_tmds_output(struct intel_hdmi *hdmi, bool enable);
> +void intel_infoframe_init(struct intel_digital_port *intel_dig_port);
>
>
>   /* intel_lvds.c */
> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> index 319f5013923c..637b17baf798 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -1801,6 +1801,33 @@ intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *c
>   	intel_hdmi->aspect_ratio = HDMI_PICTURE_ASPECT_NONE;
>   }
>
> +void intel_infoframe_init(struct intel_digital_port *intel_dig_port)
> +{
> +	struct drm_device *dev = intel_dig_port->base.base.dev;
> +
> +	if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) {
> +		intel_dig_port->write_infoframe = vlv_write_infoframe;
> +		intel_dig_port->set_infoframes = vlv_set_infoframes;
> +		intel_dig_port->infoframe_enabled = vlv_infoframe_enabled;
> +	} else if (IS_G4X(dev)) {
> +		intel_dig_port->write_infoframe = g4x_write_infoframe;
> +		intel_dig_port->set_infoframes = g4x_set_infoframes;
> +		intel_dig_port->infoframe_enabled = g4x_infoframe_enabled;
> +	} else if (HAS_DDI(dev)) {
> +		intel_dig_port->write_infoframe = hsw_write_infoframe;
> +		intel_dig_port->set_infoframes = hsw_set_infoframes;
> +		intel_dig_port->infoframe_enabled = hsw_infoframe_enabled;
> +	} else if (HAS_PCH_IBX(dev)) {
> +		intel_dig_port->write_infoframe = ibx_write_infoframe;
> +		intel_dig_port->set_infoframes = ibx_set_infoframes;
> +		intel_dig_port->infoframe_enabled = ibx_infoframe_enabled;
> +	} else {
> +		intel_dig_port->write_infoframe = cpt_write_infoframe;
> +		intel_dig_port->set_infoframes = cpt_set_infoframes;
> +		intel_dig_port->infoframe_enabled = cpt_infoframe_enabled;
> +	}
> +}
> +
>   void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
>   			       struct intel_connector *intel_connector)
>   {
> @@ -1883,28 +1910,6 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
>   		BUG();
>   	}
>
> -	if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) {
> -		intel_dig_port->write_infoframe = vlv_write_infoframe;
> -		intel_dig_port->set_infoframes = vlv_set_infoframes;
> -		intel_dig_port->infoframe_enabled = vlv_infoframe_enabled;
> -	} else if (IS_G4X(dev)) {
> -		intel_dig_port->write_infoframe = g4x_write_infoframe;
> -		intel_dig_port->set_infoframes = g4x_set_infoframes;
> -		intel_dig_port->infoframe_enabled = g4x_infoframe_enabled;
> -	} else if (HAS_DDI(dev)) {
> -		intel_dig_port->write_infoframe = hsw_write_infoframe;
> -		intel_dig_port->set_infoframes = hsw_set_infoframes;
> -		intel_dig_port->infoframe_enabled = hsw_infoframe_enabled;
> -	} else if (HAS_PCH_IBX(dev)) {
> -		intel_dig_port->write_infoframe = ibx_write_infoframe;
> -		intel_dig_port->set_infoframes = ibx_set_infoframes;
> -		intel_dig_port->infoframe_enabled = ibx_infoframe_enabled;
> -	} else {
> -		intel_dig_port->write_infoframe = cpt_write_infoframe;
> -		intel_dig_port->set_infoframes = cpt_set_infoframes;
> -		intel_dig_port->infoframe_enabled = cpt_infoframe_enabled;
> -	}
> -
>   	if (HAS_DDI(dev))
>   		intel_connector->get_hw_state = intel_ddi_connector_get_hw_state;
>   	else
> @@ -2002,5 +2007,7 @@ void intel_hdmi_init(struct drm_device *dev,
>   	intel_dig_port->dp.output_reg = INVALID_MMIO_REG;
>   	intel_dig_port->max_lanes = 4;
>
> +	intel_infoframe_init(intel_dig_port);
> +
>   	intel_hdmi_init_connector(intel_dig_port, intel_connector);
>   }
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx