[Intel-gfx] [PATCH 2/3] drm/i915: correct BLC vs PWM enable/disable ordering

[Jesse Barnes]

Jani, can you review this one?  It's still needed for us to conform to
the eDP timing spec.

Thanks,
Jesse

On Mon, 31 Mar 2014 11:13:56 -0700
Jesse Barnes <jbarnes at virtuousgeek.org> wrote:

> With the new checks in place, we can see we're doing things backwards,
> so fix them up per the spec.
> 
> Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
> ---
>  drivers/gpu/drm/i915/intel_dp.c | 13 +++++++------
>  1 file changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index b6f7087..d540fbe 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -1273,8 +1273,6 @@ void intel_edp_panel_off(struct intel_dp *intel_dp)
>  
>  	DRM_DEBUG_KMS("Turn eDP power off\n");
>  
> -	edp_wait_backlight_off(intel_dp);
> -
>  	WARN(!intel_dp->want_panel_vdd, "Need VDD to turn off panel\n");
>  
>  	/* By this time the PWM and BLC bits should be off already */
> @@ -1316,6 +1314,9 @@ void intel_edp_backlight_on(struct intel_dp *intel_dp)
>  		return;
>  
>  	DRM_DEBUG_KMS("\n");
> +
> +	intel_panel_enable_backlight(intel_dp->attached_connector);
> +
>  	/*
>  	 * If we enable the backlight right away following a panel power
>  	 * on, we may see slight flicker as the panel syncs with the eDP
> @@ -1333,8 +1334,6 @@ void intel_edp_backlight_on(struct intel_dp *intel_dp)
>  
>  	I915_WRITE(pp_ctrl_reg, pp);
>  	POSTING_READ(pp_ctrl_reg);
> -
> -	intel_panel_enable_backlight(intel_dp->attached_connector);
>  }
>  
>  void intel_edp_backlight_off(struct intel_dp *intel_dp)
> @@ -1350,8 +1349,6 @@ void intel_edp_backlight_off(struct intel_dp *intel_dp)
>  	/* PWM must still be enabled here */
>  	assert_pwm_enabled(intel_dp->attached_connector);
>  
> -	intel_panel_disable_backlight(intel_dp->attached_connector);
> -
>  	DRM_DEBUG_KMS("\n");
>  	pp = ironlake_get_pp_control(intel_dp);
>  	pp &= ~EDP_BLC_ENABLE;
> @@ -1361,6 +1358,10 @@ void intel_edp_backlight_off(struct intel_dp *intel_dp)
>  	I915_WRITE(pp_ctrl_reg, pp);
>  	POSTING_READ(pp_ctrl_reg);
>  	intel_dp->last_backlight_off = jiffies;
> +
> +	edp_wait_backlight_off(intel_dp);
> +
> +	intel_panel_disable_backlight(intel_dp->attached_connector);
>  }
>  
>  static void ironlake_edp_pll_on(struct intel_dp *intel_dp)


-- 
Jesse Barnes, Intel Open Source Technology Center