Commit 6067aaea authored by Jesse Barnes's avatar Jesse Barnes Committed by Keith Packard
Browse files

drm/i915: split clock gating init into per-chipset functions 



This helps contain the mess to init_display() instead.

Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: default avatarKeith Packard <keithp@keithp.com>
Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
parent 90711d50

drivers/gpu/drm/i915/i915_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -209,12 +209,12 @@ struct drm_i915_display_funcs { 
			     int x, int y,

			     struct drm_framebuffer *old_fb);

	void (*fdi_link_train)(struct drm_crtc *crtc);

	void (*init_clock_gating)(struct drm_device *dev);

	/* clock updates for mode set */

	/* cursor updates */

	/* render clock increase/decrease */

	/* display clock increase/decrease */

	/* pll clock increase/decrease */

	/* clock gating init */

};



struct intel_device_info {

drivers/gpu/drm/i915/i915_suspend.c

+1 −1
Original line number Diff line number Diff line
@@ -864,7 +864,7 @@ int i915_restore_state(struct drm_device *dev) 
	}



	/* Clock gating state */

	intel_enable_clock_gating(dev);

	dev_priv->display.init_clock_gating(dev);



	if (IS_IRONLAKE_M(dev)) {

		ironlake_enable_drps(dev);

drivers/gpu/drm/i915/intel_display.c

+193 −144
Original line number Diff line number Diff line
@@ -7211,19 +7211,11 @@ void gen6_enable_rps(struct drm_i915_private *dev_priv) 
	mutex_unlock(&dev_priv->dev->struct_mutex);

}



void intel_enable_clock_gating(struct drm_device *dev)

static void ironlake_init_clock_gating(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	int pipe;



	/*

	 * Disable clock gating reported to work incorrectly according to the

	 * specs, but enable as much else as we can.

	 */

	if (HAS_PCH_SPLIT(dev)) {

	uint32_t dspclk_gate = VRHUNIT_CLOCK_GATE_DISABLE;



		if (IS_GEN5(dev)) {

	/* Required for FBC */

	dspclk_gate |= DPFCUNIT_CLOCK_GATE_DISABLE |

		DPFCRUNIT_CLOCK_GATE_DISABLE |
@@ -7236,7 +7228,6 @@ void intel_enable_clock_gating(struct drm_device *dev) 
		   SVSMUNIT_CLOCK_GATE_DISABLE);

	I915_WRITE(PCH_3DCGDIS1,

		   VFMUNIT_CLOCK_GATE_DISABLE);

		}



	I915_WRITE(PCH_DSPCLK_GATE_D, dspclk_gate);
@@ -7254,7 +7245,6 @@ void intel_enable_clock_gating(struct drm_device *dev) 
	 * The bit 5 of 0x42020

	 * The bit 15 of 0x45000

	 */

		if (IS_GEN5(dev)) {

	I915_WRITE(ILK_DISPLAY_CHICKEN2,

		   (I915_READ(ILK_DISPLAY_CHICKEN2) |

		    ILK_DPARB_GATE | ILK_VSDPFD_FULL));
@@ -7267,7 +7257,7 @@ void intel_enable_clock_gating(struct drm_device *dev) 
	I915_WRITE(WM3_LP_ILK, 0);

	I915_WRITE(WM2_LP_ILK, 0);

	I915_WRITE(WM1_LP_ILK, 0);

		}



	/*

	 * Based on the document from hardware guys the following bits

	 * should be set unconditionally in order to enable FBC.
@@ -7292,14 +7282,30 @@ void intel_enable_clock_gating(struct drm_device *dev) 
	I915_WRITE(ILK_DISPLAY_CHICKEN2,

		   I915_READ(ILK_DISPLAY_CHICKEN2) |

		   ILK_ELPIN_409_SELECT);



		if (IS_GEN5(dev)) {

	I915_WRITE(_3D_CHICKEN2,

		   _3D_CHICKEN2_WM_READ_PIPELINED << 16 |

		   _3D_CHICKEN2_WM_READ_PIPELINED);

}



		if (IS_GEN6(dev) || IS_IVYBRIDGE(dev)) {

static void gen6_init_clock_gating(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	int pipe;

	uint32_t dspclk_gate = VRHUNIT_CLOCK_GATE_DISABLE;



	I915_WRITE(PCH_DSPCLK_GATE_D, dspclk_gate);



	/*

	 * On Ibex Peak and Cougar Point, we need to disable clock

	 * gating for the panel power sequencer or it will fail to

	 * start up when no ports are active.

	 */

	I915_WRITE(SOUTH_DSPCLK_GATE_D, PCH_DPLSUNIT_CLOCK_GATE_DISABLE);



	I915_WRITE(ILK_DISPLAY_CHICKEN2,

		   I915_READ(ILK_DISPLAY_CHICKEN2) |

		   ILK_ELPIN_409_SELECT);



	I915_WRITE(WM3_LP_ILK, 0);

	I915_WRITE(WM2_LP_ILK, 0);

	I915_WRITE(WM1_LP_ILK, 0);
@@ -7329,8 +7335,12 @@ void intel_enable_clock_gating(struct drm_device *dev) 
			   I915_READ(DSPCNTR(pipe)) |

			   DISPPLANE_TRICKLE_FEED_DISABLE);

}

	} else if (IS_G4X(dev)) {



static void g4x_init_clock_gating(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	uint32_t dspclk_gate;



	I915_WRITE(RENCLK_GATE_D1, 0);

	I915_WRITE(RENCLK_GATE_D2, VF_UNIT_CLOCK_GATE_DISABLE |

		   GS_UNIT_CLOCK_GATE_DISABLE |
@@ -7342,30 +7352,53 @@ void intel_enable_clock_gating(struct drm_device *dev) 
	if (IS_GM45(dev))

		dspclk_gate |= DSSUNIT_CLOCK_GATE_DISABLE;

	I915_WRITE(DSPCLK_GATE_D, dspclk_gate);

	} else if (IS_CRESTLINE(dev)) {

}



static void crestline_init_clock_gating(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;



	I915_WRITE(RENCLK_GATE_D1, I965_RCC_CLOCK_GATE_DISABLE);

	I915_WRITE(RENCLK_GATE_D2, 0);

	I915_WRITE(DSPCLK_GATE_D, 0);

	I915_WRITE(RAMCLK_GATE_D, 0);

	I915_WRITE16(DEUC, 0);

	} else if (IS_BROADWATER(dev)) {

}



static void broadwater_init_clock_gating(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;



	I915_WRITE(RENCLK_GATE_D1, I965_RCZ_CLOCK_GATE_DISABLE |

		   I965_RCC_CLOCK_GATE_DISABLE |

		   I965_RCPB_CLOCK_GATE_DISABLE |

		   I965_ISC_CLOCK_GATE_DISABLE |

		   I965_FBC_CLOCK_GATE_DISABLE);

	I915_WRITE(RENCLK_GATE_D2, 0);

	} else if (IS_GEN3(dev)) {

}



static void gen3_init_clock_gating(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	u32 dstate = I915_READ(D_STATE);



	dstate |= DSTATE_PLL_D3_OFF | DSTATE_GFX_CLOCK_GATING |

		DSTATE_DOT_CLOCK_GATING;

	I915_WRITE(D_STATE, dstate);

	} else if (IS_I85X(dev) || IS_I865G(dev)) {

}



static void i85x_init_clock_gating(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;



	I915_WRITE(RENCLK_GATE_D1, SV_CLOCK_GATE_DISABLE);

	} else if (IS_I830(dev)) {

		I915_WRITE(DSPCLK_GATE_D, OVRUNIT_CLOCK_GATE_DISABLE);

}



static void i830_init_clock_gating(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;



	I915_WRITE(DSPCLK_GATE_D, OVRUNIT_CLOCK_GATE_DISABLE);

}



static void ironlake_teardown_rc6(struct drm_device *dev)
@@ -7549,6 +7582,7 @@ static void intel_init_display(struct drm_device *dev) 
				dev_priv->display.update_wm = NULL;

			}

			dev_priv->display.fdi_link_train = ironlake_fdi_link_train;

			dev_priv->display.init_clock_gating = ironlake_init_clock_gating;

		} else if (IS_GEN6(dev)) {

			if (SNB_READ_WM0_LATENCY()) {

				dev_priv->display.update_wm = sandybridge_update_wm;
@@ -7558,6 +7592,7 @@ static void intel_init_display(struct drm_device *dev) 
				dev_priv->display.update_wm = NULL;

			}

			dev_priv->display.fdi_link_train = gen6_fdi_link_train;

			dev_priv->display.init_clock_gating = gen6_init_clock_gating;

		} else if (IS_IVYBRIDGE(dev)) {

			/* FIXME: detect B0+ stepping and use auto training */

			dev_priv->display.fdi_link_train = ivb_manual_fdi_link_train;
@@ -7568,6 +7603,8 @@ static void intel_init_display(struct drm_device *dev) 
					      "Disable CxSR\n");

				dev_priv->display.update_wm = NULL;

			}

			dev_priv->display.init_clock_gating = gen6_init_clock_gating;



		} else

			dev_priv->display.update_wm = NULL;

	} else if (IS_PINEVIEW(dev)) {
@@ -7585,18 +7622,30 @@ static void intel_init_display(struct drm_device *dev) 
			dev_priv->display.update_wm = NULL;

		} else

			dev_priv->display.update_wm = pineview_update_wm;

	} else if (IS_G4X(dev))

	} else if (IS_G4X(dev)) {

		dev_priv->display.update_wm = g4x_update_wm;

	else if (IS_GEN4(dev))

		dev_priv->display.init_clock_gating = g4x_init_clock_gating;

	} else if (IS_GEN4(dev)) {

		dev_priv->display.update_wm = i965_update_wm;

	else if (IS_GEN3(dev)) {

		if (IS_CRESTLINE(dev))

			dev_priv->display.init_clock_gating = crestline_init_clock_gating;

		else if (IS_BROADWATER(dev))

			dev_priv->display.init_clock_gating = broadwater_init_clock_gating;

	} else if (IS_GEN3(dev)) {

		dev_priv->display.update_wm = i9xx_update_wm;

		dev_priv->display.get_fifo_size = i9xx_get_fifo_size;

		dev_priv->display.init_clock_gating = gen3_init_clock_gating;

	} else if (IS_I865G(dev)) {

		dev_priv->display.update_wm = i830_update_wm;

		dev_priv->display.init_clock_gating = i85x_init_clock_gating;

		dev_priv->display.get_fifo_size = i830_get_fifo_size;

	} else if (IS_I85X(dev)) {

		dev_priv->display.update_wm = i9xx_update_wm;

		dev_priv->display.get_fifo_size = i85x_get_fifo_size;

		dev_priv->display.init_clock_gating = i85x_init_clock_gating;

	} else {

		dev_priv->display.update_wm = i830_update_wm;

		dev_priv->display.init_clock_gating = i830_init_clock_gating;

		if (IS_845G(dev))

			dev_priv->display.get_fifo_size = i845_get_fifo_size;

		else
@@ -7726,7 +7775,7 @@ void intel_modeset_init(struct drm_device *dev) 
	i915_disable_vga(dev);

	intel_setup_outputs(dev);



	intel_enable_clock_gating(dev);

	dev_priv->display.init_clock_gating(dev);



	if (IS_IRONLAKE_M(dev)) {

		ironlake_enable_drps(dev);