Reviewed-by: Rodrigo Vivi <rodrigo.vivi at gmail.com>
On Tue, Oct 23, 2012 at 6:30 PM, Paulo Zanoni <przanoni at gmail.com> wrote:
> From: Paulo Zanoni <paulo.r.zanoni at intel.com>
>
> It's an important step :)
>
> Signed-off-by: Paulo Zanoni <paulo.r.zanoni at intel.com>
> ---
> drivers/gpu/drm/i915/intel_ddi.c | 18 ++++++++++++++++--
> drivers/gpu/drm/i915/intel_dp.c | 11 ++++-------
> drivers/gpu/drm/i915/intel_drv.h | 4 ++++
> 3 files changed, 24 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index 232f2d0..47b52eb 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -1163,12 +1163,19 @@ void intel_ddi_pre_enable(struct intel_encoder *intel_encoder)
> struct drm_i915_private *dev_priv = encoder->dev->dev_private;
> struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> enum port port = intel_ddi_get_encoder_port(intel_encoder);
> + int type = intel_encoder->type;
>
> - WARN_ON(intel_crtc->ddi_pll_sel == PORT_CLK_SEL_NONE);
> + if (type == INTEL_OUTPUT_EDP) {
> + struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
> + ironlake_edp_panel_vdd_on(intel_dp);
> + ironlake_edp_panel_on(intel_dp);
> + ironlake_edp_panel_vdd_off(intel_dp, true);
> + }
>
> + WARN_ON(intel_crtc->ddi_pll_sel == PORT_CLK_SEL_NONE);
> I915_WRITE(PORT_CLK_SEL(port), intel_crtc->ddi_pll_sel);
>
> - if (intel_encoder->type == INTEL_OUTPUT_DISPLAYPORT) {
> + if (type == INTEL_OUTPUT_DISPLAYPORT || type == INTEL_OUTPUT_EDP) {
> struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
>
> intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_ON);
> @@ -1196,6 +1203,7 @@ void intel_ddi_post_disable(struct intel_encoder *intel_encoder)
> struct drm_encoder *encoder = &intel_encoder->base;
> struct drm_i915_private *dev_priv = encoder->dev->dev_private;
> enum port port = intel_ddi_get_encoder_port(intel_encoder);
> + int type = intel_encoder->type;
> uint32_t val;
> bool wait = false;
>
> @@ -1214,6 +1222,12 @@ void intel_ddi_post_disable(struct intel_encoder *intel_encoder)
> if (wait)
> intel_wait_ddi_buf_idle(dev_priv, port);
>
> + if (type == INTEL_OUTPUT_EDP) {
> + struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
> + ironlake_edp_panel_vdd_on(intel_dp);
> + ironlake_edp_panel_off(intel_dp);
> + }
> +
> I915_WRITE(PORT_CLK_SEL(port), PORT_CLK_SEL_NONE);
> }
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index d926f99..2f7acba 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -651,9 +651,6 @@ intel_dp_i2c_aux_ch(struct i2c_adapter *adapter, int mode,
> return -EREMOTEIO;
> }
>
> -static void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp);
> -static void ironlake_edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync);
> -
> static int
> intel_dp_i2c_init(struct intel_dp *intel_dp,
> struct intel_connector *intel_connector, const char *name)
> @@ -1004,7 +1001,7 @@ static u32 ironlake_get_pp_control(struct drm_i915_private *dev_priv)
> return control;
> }
>
> -static void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp)
> +void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp)
> {
> struct drm_device *dev = intel_dp->base.base.dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> @@ -1074,7 +1071,7 @@ static void ironlake_panel_vdd_work(struct work_struct *__work)
> mutex_unlock(&dev->mode_config.mutex);
> }
>
> -static void ironlake_edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync)
> +void ironlake_edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync)
> {
> if (!is_edp(intel_dp))
> return;
> @@ -1097,7 +1094,7 @@ static void ironlake_edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync)
> }
> }
>
> -static void ironlake_edp_panel_on(struct intel_dp *intel_dp)
> +void ironlake_edp_panel_on(struct intel_dp *intel_dp)
> {
> struct drm_device *dev = intel_dp->base.base.dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> @@ -1139,7 +1136,7 @@ static void ironlake_edp_panel_on(struct intel_dp *intel_dp)
> }
> }
>
> -static void ironlake_edp_panel_off(struct intel_dp *intel_dp)
> +void ironlake_edp_panel_off(struct intel_dp *intel_dp)
> {
> struct drm_device *dev = intel_dp->base.base.dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index 47d62fb..b9faeec 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -441,6 +441,10 @@ extern void intel_dp_sink_dpms(struct intel_dp *intel_dp, int mode);
> extern bool intel_dpd_is_edp(struct drm_device *dev);
> extern void ironlake_edp_backlight_on(struct intel_dp *intel_dp);
> extern void ironlake_edp_backlight_off(struct intel_dp *intel_dp);
> +extern void ironlake_edp_panel_on(struct intel_dp *intel_dp);
> +extern void ironlake_edp_panel_off(struct intel_dp *intel_dp);
> +extern void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp);
> +extern void ironlake_edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync);
> extern void intel_edp_link_config(struct intel_encoder *, int *, int *);
> extern int intel_edp_target_clock(struct intel_encoder *,
> struct drm_display_mode *mode);
> --
> 1.7.11.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Rodrigo Vivi
Blog: http://blog.vivi.eng.br
