Commit 19ab3f8b authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/modes: drop __drm_framebuffer_unregister. 



Just use the generic function.

The main side effect of this is that the fb->base.id
is now protected by the idr mutex as well.

Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent f55f1f91

drivers/gpu/drm/drm_crtc.c

+2 −14
Original line number Diff line number Diff line
@@ -389,15 +389,6 @@ struct drm_mode_object *drm_mode_object_find(struct drm_device *dev, 
}

EXPORT_SYMBOL(drm_mode_object_find);



/* dev->mode_config.fb_lock must be held! */

static void __drm_framebuffer_unregister(struct drm_device *dev,

					 struct drm_framebuffer *fb)

{

	drm_mode_object_put(dev, &fb->base);



	fb->base.id = 0;

}



static void drm_framebuffer_free(struct kref *kref)

{

	struct drm_framebuffer *fb =
@@ -409,10 +400,7 @@ static void drm_framebuffer_free(struct kref *kref) 
	 * removed at this point. Check for that.

	 */

	mutex_lock(&dev->mode_config.fb_lock);

	if (fb->base.id) {

		/* Mark fb as reaped and drop idr ref. */

		__drm_framebuffer_unregister(dev, fb);

	}

	drm_mode_object_unregister(dev, &fb->base);

	mutex_unlock(&dev->mode_config.fb_lock);



	fb->funcs->destroy(fb);
@@ -549,7 +537,7 @@ void drm_framebuffer_unregister_private(struct drm_framebuffer *fb) 


	mutex_lock(&dev->mode_config.fb_lock);

	/* Mark fb as reaped and drop idr ref. */

	__drm_framebuffer_unregister(dev, fb);

	drm_mode_object_unregister(dev, &fb->base);

	mutex_unlock(&dev->mode_config.fb_lock);

}

EXPORT_SYMBOL(drm_framebuffer_unregister_private);