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

Commit 0f45c26f authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Jani Nikula
Browse files

drm/atomic: add a drm_atomic_clean_old_fb helper. 



This is useful for all the boilerplate code about cleaning old_fb.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1447237751-9663-4-git-send-email-maarten.lankhorst@ubuntu.com
parent 45723728

drivers/gpu/drm/drm_atomic.c

+40 −18
Original line number Diff line number Diff line
@@ -1432,6 +1432,45 @@ static int atomic_set_prop(struct drm_atomic_state *state, 
	return ret;

}



/**

 * drm_atomic_update_old_fb -- Unset old_fb pointers and set plane->fb pointers.

 *

 * @dev: drm device to check.

 * @plane_mask: plane mask for planes that were updated.

 * @ret: return value, can be -EDEADLK for a retry.

 *

 * Before doing an update plane->old_fb is set to plane->fb,

 * but before dropping the locks old_fb needs to be set to NULL

 * and plane->fb updated. This is a common operation for each

 * atomic update, so this call is split off as a helper.

 */

void drm_atomic_clean_old_fb(struct drm_device *dev,

			     unsigned plane_mask,

			     int ret)

{

	struct drm_plane *plane;



	/* if succeeded, fixup legacy plane crtc/fb ptrs before dropping

	 * locks (ie. while it is still safe to deref plane->state).  We

	 * need to do this here because the driver entry points cannot

	 * distinguish between legacy and atomic ioctls.

	 */

	drm_for_each_plane_mask(plane, dev, plane_mask) {

		if (ret == 0) {

			struct drm_framebuffer *new_fb = plane->state->fb;

			if (new_fb)

				drm_framebuffer_reference(new_fb);

			plane->fb = new_fb;

			plane->crtc = plane->state->crtc;



			if (plane->old_fb)

				drm_framebuffer_unreference(plane->old_fb);

		}

		plane->old_fb = NULL;

	}

}

EXPORT_SYMBOL(drm_atomic_clean_old_fb);



int drm_mode_atomic_ioctl(struct drm_device *dev,

			  void *data, struct drm_file *file_priv)

{
@@ -1577,24 +1616,7 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, 
	}



out:

	/* if succeeded, fixup legacy plane crtc/fb ptrs before dropping

	 * locks (ie. while it is still safe to deref plane->state).  We

	 * need to do this here because the driver entry points cannot

	 * distinguish between legacy and atomic ioctls.

	 */

	drm_for_each_plane_mask(plane, dev, plane_mask) {

		if (ret == 0) {

			struct drm_framebuffer *new_fb = plane->state->fb;

			if (new_fb)

				drm_framebuffer_reference(new_fb);

			plane->fb = new_fb;

			plane->crtc = plane->state->crtc;



			if (plane->old_fb)

				drm_framebuffer_unreference(plane->old_fb);

		}

		plane->old_fb = NULL;

	}

	drm_atomic_clean_old_fb(dev, plane_mask, ret);



	if (ret && arg->flags & DRM_MODE_PAGE_FLIP_EVENT) {

		/*

include/drm/drm_atomic.h

+3 −0
Original line number Diff line number Diff line
@@ -136,6 +136,9 @@ drm_atomic_connectors_for_crtc(struct drm_atomic_state *state, 


void drm_atomic_legacy_backoff(struct drm_atomic_state *state);



void

drm_atomic_clean_old_fb(struct drm_device *dev, unsigned plane_mask, int ret);



int __must_check drm_atomic_check_only(struct drm_atomic_state *state);

int __must_check drm_atomic_commit(struct drm_atomic_state *state);

int __must_check drm_atomic_async_commit(struct drm_atomic_state *state);