Commit 0b8765c6 authored by Jesse Barnes's avatar Jesse Barnes Committed by Chris Wilson
Browse files

drm/i915: split i9xx CRTC enable/disable code 



So we can use it for CRTC prepare/commit.

Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 6be4a607

drivers/gpu/drm/i915/intel_display.c

+103 −82
Original line number Diff line number Diff line
@@ -2262,7 +2262,7 @@ static void intel_crtc_dpms_overlay(struct intel_crtc *intel_crtc, bool enable) 
	 */

}



static void i9xx_crtc_dpms(struct drm_crtc *crtc, int mode)

static void i9xx_crtc_enable(struct drm_crtc *crtc)

{

	struct drm_device *dev = crtc->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -2275,13 +2275,6 @@ static void i9xx_crtc_dpms(struct drm_crtc *crtc, int mode) 
	int pipeconf_reg = (pipe == 0) ? PIPEACONF : PIPEBCONF;

	u32 temp;



	/* XXX: When our outputs are all unaware of DPMS modes other than off

	 * and on, we should map those modes to DRM_MODE_DPMS_OFF in the CRTC.

	 */

	switch (mode) {

	case DRM_MODE_DPMS_ON:

	case DRM_MODE_DPMS_STANDBY:

	case DRM_MODE_DPMS_SUSPEND:

	/* Enable the DPLL */

	temp = I915_READ(dpll_reg);

	if ((temp & DPLL_VCO_ENABLE) == 0) {
@@ -2319,8 +2312,21 @@ static void i9xx_crtc_dpms(struct drm_crtc *crtc, int mode) 


	/* Give the overlay scaler a chance to enable if it's on this pipe */

	intel_crtc_dpms_overlay(intel_crtc, true);

	break;

	case DRM_MODE_DPMS_OFF:

}



static void i9xx_crtc_disable(struct drm_crtc *crtc)

{

	struct drm_device *dev = crtc->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

	int pipe = intel_crtc->pipe;

	int plane = intel_crtc->plane;

	int dpll_reg = (pipe == 0) ? DPLL_A : DPLL_B;

	int dspcntr_reg = (plane == 0) ? DSPACNTR : DSPBCNTR;

	int dspbase_reg = (plane == 0) ? DSPAADDR : DSPBADDR;

	int pipeconf_reg = (pipe == 0) ? PIPEACONF : PIPEBCONF;

	u32 temp;



	/* Give the overlay scaler a chance to disable if it's on this pipe */

	intel_crtc_dpms_overlay(intel_crtc, false);

	drm_vblank_off(dev, pipe);
@@ -2366,6 +2372,21 @@ static void i9xx_crtc_dpms(struct drm_crtc *crtc, int mode) 
skip_pipe_off:

	/* Wait for the clocks to turn off. */

	udelay(150);

}



static void i9xx_crtc_dpms(struct drm_crtc *crtc, int mode)

{

	/* XXX: When our outputs are all unaware of DPMS modes other than off

	 * and on, we should map those modes to DRM_MODE_DPMS_OFF in the CRTC.

	 */

	switch (mode) {

	case DRM_MODE_DPMS_ON:

	case DRM_MODE_DPMS_STANDBY:

	case DRM_MODE_DPMS_SUSPEND:

		i9xx_crtc_enable(crtc);

		break;

	case DRM_MODE_DPMS_OFF:

		i9xx_crtc_disable(crtc);

		break;

	}

}