Hi
2012/9/6 Daniel Vetter <daniel.vetter at ffwll.ch>:
> These have been added because dp links are fiddle things and don't
> like it when we try to re-train an enabled output (or disable a
> disabled output harder). And because the crtc helper code is
> ridiculously bad add tracking the modeset state.
>
> But with the new code in place it is simply a bug to disable a disabled
> encoder or to enable an enabled encoder again. Hence convert these to
> WARNs (and bail out for safety), but flatten all conditionals in the
> code itself.
>
> Signed-Off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni at intel.com>
> ---
> drivers/gpu/drm/i915/intel_dp.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 7c746d1..07f9521 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -1333,15 +1333,15 @@ static void intel_enable_dp(struct intel_encoder *encoder)
> struct drm_i915_private *dev_priv = dev->dev_private;
> uint32_t dp_reg = I915_READ(intel_dp->output_reg);
>
> + if (WARN_ON(dp_reg & DP_PORT_EN))
> + return;
> +
> ironlake_edp_panel_vdd_on(intel_dp);
> intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_ON);
> - if (!(dp_reg & DP_PORT_EN)) {
> - intel_dp_start_link_train(intel_dp);
> - ironlake_edp_panel_on(intel_dp);
> - ironlake_edp_panel_vdd_off(intel_dp, true);
> - intel_dp_complete_link_train(intel_dp);
> - } else
> - ironlake_edp_panel_vdd_off(intel_dp, false);
> + intel_dp_start_link_train(intel_dp);
> + ironlake_edp_panel_on(intel_dp);
> + ironlake_edp_panel_vdd_off(intel_dp, true);
> + intel_dp_complete_link_train(intel_dp);
> ironlake_edp_backlight_on(intel_dp);
> }
>
> @@ -1913,7 +1913,7 @@ intel_dp_link_down(struct intel_dp *intel_dp)
> struct drm_i915_private *dev_priv = dev->dev_private;
> uint32_t DP = intel_dp->DP;
>
> - if ((I915_READ(intel_dp->output_reg) & DP_PORT_EN) == 0)
> + if (WARN_ON((I915_READ(intel_dp->output_reg) & DP_PORT_EN) == 0))
> return;
>
> DRM_DEBUG_KMS("\n");
> --
> 1.7.11.2
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Paulo Zanoni
