drm/gma500/cdv: Convert to gma_crtc_dpms() (7ea03f06) · Commits · jan.koester / Linux

drivers/gpu/drm/gma500/cdv_intel_display.c

+3 −134

Original line number	Diff line number	Diff line
		@@ -512,7 +512,7 @@ static bool is_pipeb_lvds(struct drm_device dev, struct drm_crtc crtc)
		return false;
		}

		static void cdv_intel_disable_self_refresh (struct drm_device *dev)
		void cdv_intel_disable_self_refresh(struct drm_device *dev)
		{
		if (REG_READ(FW_BLC_SELF) & FW_BLC_SELF_EN) {

		@@ -533,7 +533,7 @@ static void cdv_intel_disable_self_refresh (struct drm_device *dev)

		}

		static void cdv_intel_update_watermark (struct drm_device dev, struct drm_crtc crtc)
		void cdv_intel_update_watermark(struct drm_device dev, struct drm_crtc crtc)
		{

		if (cdv_intel_single_pipe_active(dev)) {
		@@ -645,137 +645,6 @@ static void cdv_intel_crtc_load_lut(struct drm_crtc *crtc)
		}
		}

		/**
		* Sets the power management mode of the pipe and plane.
		*
		* This code should probably grow support for turning the cursor off and back
		* on appropriately at the same time as we're turning the pipe off/on.
		*/
		static void cdv_intel_crtc_dpms(struct drm_crtc *crtc, int mode)
		{
		struct drm_device *dev = crtc->dev;
		struct drm_psb_private *dev_priv = dev->dev_private;
		struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
		int pipe = psb_intel_crtc->pipe;
		const struct psb_offset *map = &dev_priv->regmap[pipe];
		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.
		*/
		cdv_intel_disable_self_refresh(dev);

		switch (mode) {
		case DRM_MODE_DPMS_ON:
		case DRM_MODE_DPMS_STANDBY:
		case DRM_MODE_DPMS_SUSPEND:
		if (psb_intel_crtc->active)
		break;

		psb_intel_crtc->active = true;

		/* Enable the DPLL */
		temp = REG_READ(map->dpll);
		if ((temp & DPLL_VCO_ENABLE) == 0) {
		REG_WRITE(map->dpll, temp);
		REG_READ(map->dpll);
		/* Wait for the clocks to stabilize. */
		udelay(150);
		REG_WRITE(map->dpll, temp \| DPLL_VCO_ENABLE);
		REG_READ(map->dpll);
		/* Wait for the clocks to stabilize. */
		udelay(150);
		REG_WRITE(map->dpll, temp \| DPLL_VCO_ENABLE);
		REG_READ(map->dpll);
		/* Wait for the clocks to stabilize. */
		udelay(150);
		}

		/* Jim Bish - switch plan and pipe per scott */
		/* Enable the plane */
		temp = REG_READ(map->cntr);
		if ((temp & DISPLAY_PLANE_ENABLE) == 0) {
		REG_WRITE(map->cntr,
		temp \| DISPLAY_PLANE_ENABLE);
		/* Flush the plane changes */
		REG_WRITE(map->base, REG_READ(map->base));
		}

		udelay(150);

		/* Enable the pipe */
		temp = REG_READ(map->conf);
		if ((temp & PIPEACONF_ENABLE) == 0)
		REG_WRITE(map->conf, temp \| PIPEACONF_ENABLE);

		temp = REG_READ(map->status);
		temp &= ~(0xFFFF);
		temp \|= PIPE_FIFO_UNDERRUN;
		REG_WRITE(map->status, temp);
		REG_READ(map->status);

		cdv_intel_crtc_load_lut(crtc);

		/* Give the overlay scaler a chance to enable
		* if it's on this pipe */
		/* psb_intel_crtc_dpms_video(crtc, true); TODO */
		break;
		case DRM_MODE_DPMS_OFF:
		if (!psb_intel_crtc->active)
		break;

		psb_intel_crtc->active = false;

		/* Give the overlay scaler a chance to disable
		* if it's on this pipe */
		/* psb_intel_crtc_dpms_video(crtc, FALSE); TODO */

		/* Disable the VGA plane that we never use */
		REG_WRITE(VGACNTRL, VGA_DISP_DISABLE);

		/* Jim Bish - changed pipe/plane here as well. */

		drm_vblank_off(dev, pipe);
		/* Wait for vblank for the disable to take effect */
		gma_wait_for_vblank(dev);

		/* Next, disable display pipes */
		temp = REG_READ(map->conf);
		if ((temp & PIPEACONF_ENABLE) != 0) {
		REG_WRITE(map->conf, temp & ~PIPEACONF_ENABLE);
		REG_READ(map->conf);
		}

		/* Wait for vblank for the disable to take effect. */
		gma_wait_for_vblank(dev);

		udelay(150);

		/* Disable display plane */
		temp = REG_READ(map->cntr);
		if ((temp & DISPLAY_PLANE_ENABLE) != 0) {
		REG_WRITE(map->cntr,
		temp & ~DISPLAY_PLANE_ENABLE);
		/* Flush the plane changes */
		REG_WRITE(map->base, REG_READ(map->base));
		REG_READ(map->base);
		}

		temp = REG_READ(map->dpll);
		if ((temp & DPLL_VCO_ENABLE) != 0) {
		REG_WRITE(map->dpll, temp & ~DPLL_VCO_ENABLE);
		REG_READ(map->dpll);
		}

		/* Wait for the clocks to turn off. */
		udelay(150);
		break;
		}
		cdv_intel_update_watermark(dev, crtc);
		/Set FIFO Watermarks/
		REG_WRITE(DSPARB, 0x3F3E);
		}

		/**
		* Return the pipe currently connected to the panel fitter,
		* or -1 if the panel fitter is not present or not in use
		@@ -1518,7 +1387,7 @@ struct drm_display_mode cdv_intel_crtc_mode_get(struct drm_device dev,
		}

		const struct drm_crtc_helper_funcs cdv_intel_helper_funcs = {
		.dpms = cdv_intel_crtc_dpms,
		.dpms = gma_crtc_dpms,
		.mode_fixup = gma_crtc_mode_fixup,
		.mode_set = cdv_intel_crtc_mode_set,
		.mode_set_base = gma_pipe_set_base,

drivers/gpu/drm/gma500/gma_display.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -210,10 +210,8 @@ void gma_crtc_dpms(struct drm_crtc *crtc, int mode)
		* and on, we should map those modes to DRM_MODE_DPMS_OFF in the CRTC.
		*/

		/* FIXME: Uncomment this when we move cdv to generic dpms
		if (IS_CDV(dev))
		cdv_intel_disable_self_refresh(dev);
		*/

		switch (mode) {
		case DRM_MODE_DPMS_ON:
		@@ -322,10 +320,8 @@ void gma_crtc_dpms(struct drm_crtc *crtc, int mode)
		break;
		}

		/* FIXME: Uncomment this when we move cdv to generic dpms
		if (IS_CDV(dev))
		cdv_intel_update_watermark(dev, crtc);
		*/

		/* Set FIFO watermarks */
		REG_WRITE(DSPARB, 0x3F3E);

drivers/gpu/drm/gma500/gma_display.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -85,4 +85,9 @@ extern bool gma_pll_is_valid(struct drm_crtc *crtc,
		extern bool gma_find_best_pll(const struct gma_limit_t *limit,
		struct drm_crtc *crtc, int target, int refclk,
		struct gma_clock_t *best_clock);

		/* Cedarview specific functions */
		extern void cdv_intel_disable_self_refresh(struct drm_device *dev);
		extern void cdv_intel_update_watermark(struct drm_device *dev,
		struct drm_crtc *crtc);
		#endif