gma500: Do sane FB cleanup (3cc76c1c) · Commits · 戴 / test

drivers/staging/gma500/psb_fb.c

+23 −1

Original line number	Diff line number	Diff line
		@@ -719,16 +719,38 @@ static void psb_user_framebuffer_destroy(struct drm_framebuffer *fb)
		{
		struct psb_framebuffer *psbfb = to_psb_fb(fb);
		struct gtt_range *r = psbfb->gtt;
		struct drm_device *dev = fb->dev;
		struct drm_psb_private *dev_priv = dev->dev_private;
		struct psb_fbdev *fbdev = dev_priv->fbdev;
		struct drm_crtc *crtc;
		int reset = 0;

		/* Should never get stolen memory for a user fb */
		WARN_ON(r->stolen);
		pr_err("user framebuffer destroy %p, fbdev %p\n",
		psbfb, psbfb->fbdev);
		/* Check if we are erroneously live */
		list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)
		if (crtc->fb == fb)
		reset = 1;

		if (reset)
		pr_err("DRM: gma500, forcing reset\n");

		if (reset)
		/*
		* Now force a sane response before we permit the DRM crc layer to
		* do stupid things like blank the display. Instead we reset this
		* framebuffer as if the user had forced a reset. We must do this
		* before the cleanup so that the DRM layer doesn't get a chance
		* to stick its oar in where it isn't wanted.
		*/
		drm_fb_helper_restore_fbdev_mode(&fbdev->psb_fb_helper);

		/* Let DRM do its clean up */
		drm_framebuffer_cleanup(fb);
		/* We are no longer using the resource in GEM */
		drm_gem_object_unreference_unlocked(&r->gem);

		kfree(fb);
		}

drivers/staging/gma500/psb_intel_display.c

+13 −9

Original line number	Diff line number	Diff line
		@@ -352,15 +352,15 @@ int psb_intel_pipe_set_base(struct drm_crtc *crtc,

		PSB_DEBUG_ENTRY("\n");

		if (!gma_power_begin(dev, true))
		return 0;

		/* no fb bound */
		if (!crtc->fb) {
		DRM_DEBUG("No FB bound\n");
		return 0;
		goto psb_intel_pipe_cleaner;
		}

		if (!gma_power_begin(dev, true))
		return 0;

		/* We are displaying this buffer, make sure it is actually loaded
		into the GTT */
		ret = psb_gtt_pin(psbfb->gtt);
		@@ -409,6 +409,7 @@ int psb_intel_pipe_set_base(struct drm_crtc *crtc,
		REG_READ(dspbase);
		}

		psb_intel_pipe_cleaner:
		/* If there was a previous display we can now unpin it */
		if (old_fb)
		psb_gtt_unpin(to_psb_fb(old_fb)->gtt);
		@@ -588,6 +589,7 @@ static int psb_intel_crtc_mode_set(struct drm_crtc *crtc,
		{
		struct drm_device *dev = crtc->dev;
		struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
		struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
		int pipe = psb_intel_crtc->pipe;
		int fp_reg = (pipe == 0) ? FPA0 : FPB0;
		int dpll_reg = (pipe == 0) ? DPLL_A : DPLL_B;
		@@ -610,6 +612,12 @@ static int psb_intel_crtc_mode_set(struct drm_crtc *crtc,
		struct drm_mode_config *mode_config = &dev->mode_config;
		struct drm_connector *connector;

		/* No scan out no play */
		if (crtc->fb == NULL) {
		crtc_funcs->mode_set_base(crtc, x, y, old_fb);
		return 0;
		}

		list_for_each_entry(connector, &mode_config->connector_list, head) {
		struct psb_intel_output *psb_intel_output =
		to_psb_intel_output(connector);
		@@ -786,11 +794,7 @@ static int psb_intel_crtc_mode_set(struct drm_crtc *crtc,
		REG_WRITE(dspcntr_reg, dspcntr);

		/* Flush the plane changes */
		{
		struct drm_crtc_helper_funcs *crtc_funcs =
		crtc->helper_private;
		crtc_funcs->mode_set_base(crtc, x, y, old_fb);
		}

		psb_intel_wait_for_vblank(dev);

Admin message