Re: [PATCH 53/71] drm/i915/chv: Configure crtc_mask correctly for CHV

Jani Nikula
2014-04-10T16:54:41Z

On Wed, 09 Apr 2014, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> On CHV pipe C can driver only port D, and pipes A and B can drivbe only
> ports B and C. Configure the crtc_mask appropriately to reflect that.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_dp.c | 8 +++++++-
> drivers/gpu/drm/i915/intel_hdmi.c | 8 +++++++-
> 2 files changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 21ac845..6ae4d28 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -4070,7 +4070,13 @@ intel_dp_init(struct drm_device *dev, int output_reg, enum port port)
> intel_dig_port->dp.output_reg = output_reg;
>
> intel_encoder->type = INTEL_OUTPUT_DISPLAYPORT;
> - intel_encoder->crtc_mask = (1 << 0) | (1 << 1) | (1 << 2);
> + if (IS_CHERRYVIEW(dev)) {
> + if (port == PORT_D)
> + intel_encoder->crtc_mask = 1 << 2;
> + else
> + intel_encoder->crtc_mask = (1 << 0) | (1 << 1);
> + } else
> + intel_encoder->crtc_mask = (1 << 0) | (1 << 1) | (1 << 2);

Per CodingStyle, if one branch requires braces, they all do.

> intel_encoder->cloneable = 0;
> intel_encoder->hot_plug = intel_dp_hot_plug;
>
> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> index 9f868f4..349374b 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -1426,7 +1426,13 @@ void intel_hdmi_init(struct drm_device *dev, int hdmi_reg, enum port port)
> }
>
> intel_encoder->type = INTEL_OUTPUT_HDMI;
> - intel_encoder->crtc_mask = (1 << 0) | (1 << 1) | (1 << 2);
> + if (IS_CHERRYVIEW(dev)) {
> + if (port == PORT_D)
> + intel_encoder->crtc_mask = 1 << 2;
> + else
> + intel_encoder->crtc_mask = (1 << 0) | (1 << 1);
> + } else
> + intel_encoder->crtc_mask = (1 << 0) | (1 << 1) | (1 << 2);

Ditto.

> intel_encoder->cloneable = 1 << INTEL_OUTPUT_ANALOG;
> /*
> * BSpec is unclear about HDMI+HDMI cloning on g4x, but it seems
> --
> 1.8.3.2
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

--
Jani Nikula, Intel Open Source Technology Center