Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a2b8fa6 authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm/mdp4: page_flip cleanups/fixes 



There were a few potential problems with the original page_flip/vblank
code in mdp4_crtc.

1) We need vblank irq for a couple things, both completing flips and
   updating cursor.  We need to keep track of what work is pending so
   that (for example) a cursor update while we are still waiting for
   pageflip_cb (ie. pageflip requested from userspace, but still
   waiting for rendering to complete) would not prematurely trigger
   event to userspace.

2) A preclose -> pageflip-cancel should not cancel a pageflip that
   was requested on a different file (ie. non-master closing should
   not cancel a pending pageflip).

With these fixes, we no longer have problems w/ cursor not updating and
with occasional hangs with userspace waiting for a pageflip that had
been cancelled (launching XBMC from gnome-shell overview mode was a good
way to trigger this, but now works reliably).

Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent 505886d5

drivers/gpu/drm/msm/mdp4/mdp4_crtc.c

+48 −13
Original line number Diff line number Diff line
@@ -53,6 +53,10 @@ struct mdp4_crtc { 
	struct drm_pending_vblank_event *event;

	struct msm_fence_cb pageflip_cb;



#define PENDING_CURSOR 0x1

#define PENDING_FLIP   0x2

	atomic_t pending;



	/* the fb that we currently hold a scanout ref to: */

	struct drm_framebuffer *fb;
@@ -93,7 +97,8 @@ static void update_fb(struct drm_crtc *crtc, bool async, 
	}

}



static void complete_flip(struct drm_crtc *crtc, bool canceled)

/* if file!=NULL, this is preclose potential cancel-flip path */

static void complete_flip(struct drm_crtc *crtc, struct drm_file *file)

{

	struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc);

	struct drm_device *dev = crtc->dev;
@@ -103,12 +108,15 @@ static void complete_flip(struct drm_crtc *crtc, bool canceled) 
	spin_lock_irqsave(&dev->event_lock, flags);

	event = mdp4_crtc->event;

	if (event) {

		/* if regular vblank case (!file) or if cancel-flip from

		 * preclose on file that requested flip, then send the

		 * event:

		 */

		if (!file || (event->base.file_priv == file)) {

			mdp4_crtc->event = NULL;

		if (canceled)

			event->base.destroy(&event->base);

		else

			drm_send_vblank_event(dev, mdp4_crtc->id, event);

		}

	}

	spin_unlock_irqrestore(&dev->event_lock, flags);

}
@@ -132,17 +140,29 @@ static void crtc_flush(struct drm_crtc *crtc) 
	mdp4_write(mdp4_kms, REG_MDP4_OVERLAY_FLUSH, flush);

}



static void request_pending(struct drm_crtc *crtc, uint32_t pending)

{

	struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc);



	atomic_or(pending, &mdp4_crtc->pending);

	mdp4_irq_register(get_kms(crtc), &mdp4_crtc->vblank);

}



static void pageflip_cb(struct msm_fence_cb *cb)

{

	struct mdp4_crtc *mdp4_crtc =

		container_of(cb, struct mdp4_crtc, pageflip_cb);

	struct drm_crtc *crtc = &mdp4_crtc->base;

	struct drm_framebuffer *fb = crtc->fb;



	mdp4_plane_set_scanout(mdp4_crtc->plane, crtc->fb);

	if (!fb)

		return;



	mdp4_plane_set_scanout(mdp4_crtc->plane, fb);

	crtc_flush(crtc);



	/* enable vblank to complete flip: */

	mdp4_irq_register(get_kms(crtc), &mdp4_crtc->vblank);

	request_pending(crtc, PENDING_FLIP);

}



static void unref_fb_worker(struct drm_flip_work *work, void *val)
@@ -386,6 +406,7 @@ static int mdp4_crtc_page_flip(struct drm_crtc *crtc, 
	struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc);

	struct drm_device *dev = crtc->dev;

	struct drm_gem_object *obj;

	unsigned long flags;



	if (mdp4_crtc->event) {

		dev_err(dev->dev, "already pending flip!\n");
@@ -394,7 +415,10 @@ static int mdp4_crtc_page_flip(struct drm_crtc *crtc, 


	obj = msm_framebuffer_bo(new_fb, 0);



	spin_lock_irqsave(&dev->event_lock, flags);

	mdp4_crtc->event = event;

	spin_unlock_irqrestore(&dev->event_lock, flags);



	update_fb(crtc, true, new_fb);



	return msm_gem_queue_inactive_cb(obj, &mdp4_crtc->pageflip_cb);
@@ -506,6 +530,8 @@ static int mdp4_crtc_cursor_set(struct drm_crtc *crtc, 
		drm_gem_object_unreference_unlocked(old_bo);

	}



	request_pending(crtc, PENDING_CURSOR);



	return 0;



fail:
@@ -550,14 +576,22 @@ static void mdp4_crtc_vblank_irq(struct mdp4_irq *irq, uint32_t irqstatus) 
	struct mdp4_crtc *mdp4_crtc = container_of(irq, struct mdp4_crtc, vblank);

	struct drm_crtc *crtc = &mdp4_crtc->base;

	struct msm_drm_private *priv = crtc->dev->dev_private;

	unsigned pending;



	update_cursor(crtc);

	complete_flip(crtc, false);

	mdp4_irq_unregister(get_kms(crtc), &mdp4_crtc->vblank);



	pending = atomic_xchg(&mdp4_crtc->pending, 0);



	if (pending & PENDING_FLIP) {

		complete_flip(crtc, NULL);

		drm_flip_work_commit(&mdp4_crtc->unref_fb_work, priv->wq);

	}



	if (pending & PENDING_CURSOR) {

		update_cursor(crtc);

		drm_flip_work_commit(&mdp4_crtc->unref_cursor_work, priv->wq);

	}

}



static void mdp4_crtc_err_irq(struct mdp4_irq *irq, uint32_t irqstatus)

{
@@ -573,9 +607,10 @@ uint32_t mdp4_crtc_vblank(struct drm_crtc *crtc) 
	return mdp4_crtc->vblank.irqmask;

}



void mdp4_crtc_cancel_pending_flip(struct drm_crtc *crtc)

void mdp4_crtc_cancel_pending_flip(struct drm_crtc *crtc, struct drm_file *file)

{

	complete_flip(crtc, true);

	DBG("cancel: %p", file);

	complete_flip(crtc, file);

}



/* set dma config, ie. the format the encoder wants. */

drivers/gpu/drm/msm/mdp4/mdp4_kms.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static void mdp4_preclose(struct msm_kms *kms, struct drm_file *file) 
	unsigned i;



	for (i = 0; i < priv->num_crtcs; i++)

		mdp4_crtc_cancel_pending_flip(priv->crtcs[i]);

		mdp4_crtc_cancel_pending_flip(priv->crtcs[i], file);

}



static void mdp4_destroy(struct msm_kms *kms)

drivers/gpu/drm/msm/mdp4/mdp4_kms.h

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ struct drm_plane *mdp4_plane_init(struct drm_device *dev, 
		enum mdp4_pipe pipe_id, bool private_plane);



uint32_t mdp4_crtc_vblank(struct drm_crtc *crtc);

void mdp4_crtc_cancel_pending_flip(struct drm_crtc *crtc);

void mdp4_crtc_cancel_pending_flip(struct drm_crtc *crtc, struct drm_file *file);

void mdp4_crtc_set_config(struct drm_crtc *crtc, uint32_t config);

void mdp4_crtc_set_intf(struct drm_crtc *crtc, enum mdp4_intf intf);

void mdp4_crtc_attach(struct drm_crtc *crtc, struct drm_plane *plane);