On Thu, Oct 18, 2012 at 06:21:34PM -0300, Paulo Zanoni wrote:
> From: Paulo Zanoni <paulo.r.zanoni at intel.com>
>
> We need to check if any of the pipes is using TRANSCODER_EDP.
>
> Signed-off-by: Paulo Zanoni <paulo.r.zanoni at intel.com>
I wonder whether it doesn't make more sense for haswell to return the
transcoder in the encoder->get_hw_state function, and then map that to the
crtc with the intel_pipe_to_cpu_transcoder. That way we don't need to add
a special-case for eDP.
-Daniel
> ---
> drivers/gpu/drm/i915/intel_display.c | 25 +++++++++++++++++++++++++
> 1 file changed, 25 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 73ce007..827c5ba 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -8551,6 +8551,31 @@ void intel_modeset_setup_hw_state(struct drm_device *dev)
> struct intel_encoder *encoder;
> struct intel_connector *connector;
>
> + if (IS_HASWELL(dev)) {
> + tmp = I915_READ(DDI_FUNC_CTL(TRANSCODER_EDP));
> +
> + if (tmp & TRANS_DDI_FUNC_ENABLE) {
> + switch (tmp & TRANS_DDI_EDP_INPUT_MASK) {
> + case TRANS_DDI_EDP_INPUT_A_ON:
> + case TRANS_DDI_EDP_INPUT_A_ONOFF:
> + pipe = PIPE_A;
> + break;
> + case TRANS_DDI_EDP_INPUT_B_ONOFF:
> + pipe = PIPE_B;
> + break;
> + case TRANS_DDI_EDP_INPUT_C_ONOFF:
> + pipe = PIPE_C;
> + break;
> + }
> +
> + crtc = to_intel_crtc(dev_priv->pipe_to_crtc_mapping[pipe]);
> + crtc->cpu_transcoder = TRANSCODER_EDP;
> +
> + DRM_DEBUG_KMS("Pipe %c using transcoder EDP\n",
> + pipe_name(pipe));
> + }
> + }
> +
> for_each_pipe(pipe) {
> crtc = to_intel_crtc(dev_priv->pipe_to_crtc_mapping[pipe]);
>
> --
> 1.7.11.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
