Commit a7e5e06d authored by Lyude Paul's avatar Lyude Paul
Browse files

drm/vblank: Register drmm cleanup action once per drm_vblank_crtc 



Since we'll be allocating resources for kthread_create_worker() in the
next commit (which could fail and require us to clean up the mess),
let's simplify the cleanup process a bit by registering a
drm_vblank_init_release() action for each drm_vblank_crtc so they're
still cleaned up if we fail to initialize one of them.

Changes since v3:
* Use drmm_add_action_or_reset() - Daniel Vetter

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: dri-devel@lists.freedesktop.org
Cc: nouveau@lists.freedesktop.org
Reviewed-by: default avatarDaniel Vetter <daniel@ffwll.ch>
Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Acked-by: default avatarDave Airlie <airlied@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200627194657.156514-2-lyude@redhat.com
parent 9410113f

drivers/gpu/drm/drm_vblank.c

+10 −13
Original line number Diff line number Diff line
@@ -492,17 +492,13 @@ static void vblank_disable_fn(struct timer_list *t) 


static void drm_vblank_init_release(struct drm_device *dev, void *ptr)

{

	unsigned int pipe;



	for (pipe = 0; pipe < dev->num_crtcs; pipe++) {

		struct drm_vblank_crtc *vblank = &dev->vblank[pipe];

	struct drm_vblank_crtc *vblank = ptr;



	drm_WARN_ON(dev, READ_ONCE(vblank->enabled) &&

		    drm_core_check_feature(dev, DRIVER_MODESET));



	del_timer_sync(&vblank->disable_timer);

}

}



/**

 * drm_vblank_init - initialize vblank support
@@ -511,7 +507,7 @@ static void drm_vblank_init_release(struct drm_device *dev, void *ptr) 
 *

 * This function initializes vblank support for @num_crtcs display pipelines.

 * Cleanup is handled automatically through a cleanup function added with

 * drmm_add_action().

 * drmm_add_action_or_reset().

 *

 * Returns:

 * Zero on success or a negative error code on failure.
@@ -530,10 +526,6 @@ int drm_vblank_init(struct drm_device *dev, unsigned int num_crtcs) 


	dev->num_crtcs = num_crtcs;



	ret = drmm_add_action(dev, drm_vblank_init_release, NULL);

	if (ret)

		return ret;



	for (i = 0; i < num_crtcs; i++) {

		struct drm_vblank_crtc *vblank = &dev->vblank[i];
@@ -542,6 +534,11 @@ int drm_vblank_init(struct drm_device *dev, unsigned int num_crtcs) 
		init_waitqueue_head(&vblank->queue);

		timer_setup(&vblank->disable_timer, vblank_disable_fn, 0);

		seqlock_init(&vblank->seqlock);



		ret = drmm_add_action_or_reset(dev, drm_vblank_init_release,

					       vblank);

		if (ret)

			return ret;

	}



	return 0;