Commit 82a4d9c0 authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Daniel Vetter
Browse files

drm/i915: turn the eDP DDI panel on/off 



It's an important step :)

Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent d6c50ff8

drivers/gpu/drm/i915/intel_ddi.c

+16 −2
Original line number Diff line number Diff line
@@ -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);

}

drivers/gpu/drm/i915/intel_dp.c

+4 −7
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/i915/intel_drv.h

+4 −0
Original line number Diff line number Diff line
@@ -440,6 +440,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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE