Commit 3e315332 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/client: Remove drm_client_framebuffer_delete() 



Release client buffers with drm_client_buffer_delete() instead of
drm_client_framebuffer_delete(). The latter is just a tiny wrapper
around the former.

Move the test for !buffer into drm_client_buffer_delete(), although
all callers appear to always have a valid pointer.

v2:
- test for !buffer before deref-ing pointer (Jocelyn, Dan)

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarJocelyn Falempe <jfalempe@redhat.com>
Tested-by: default avatarFrancesco Valla <francesco@valla.it>
Link: https://patch.msgid.link/20251027121042.143588-6-tzimmermann@suse.de
parent ea39f2e6

drivers/gpu/drm/clients/drm_log.c

+2 −2
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ static void drm_log_init_client(struct drm_log *dlog) 


err_failed_commit:

	for (i = 0; i < n_modeset; i++)

		drm_client_framebuffer_delete(dlog->scanout[i].buffer);

		drm_client_buffer_delete(dlog->scanout[i].buffer);



err_nomodeset:

	kfree(dlog->scanout);
@@ -286,7 +286,7 @@ static void drm_log_free_scanout(struct drm_client_dev *client) 


	if (dlog->n_scanout) {

		for (i = 0; i < dlog->n_scanout; i++)

			drm_client_framebuffer_delete(dlog->scanout[i].buffer);

			drm_client_buffer_delete(dlog->scanout[i].buffer);

		dlog->n_scanout = 0;

		kfree(dlog->scanout);

		dlog->scanout = NULL;

drivers/gpu/drm/drm_client.c

+12 −16
Original line number Diff line number Diff line
@@ -177,11 +177,19 @@ void drm_client_release(struct drm_client_dev *client) 
}

EXPORT_SYMBOL(drm_client_release);



static void drm_client_buffer_delete(struct drm_client_buffer *buffer)

/**

 * drm_client_buffer_delete - Delete a client buffer

 * @buffer: DRM client buffer

 */

void drm_client_buffer_delete(struct drm_client_buffer *buffer)

{

	struct drm_gem_object *gem = buffer->fb->obj[0];

	struct drm_gem_object *gem;

	int ret;



	if (!buffer)

		return;



	gem = buffer->fb->obj[0];

	drm_gem_vunmap(gem, &buffer->map);



	ret = drm_mode_rmfb(buffer->client->dev, buffer->fb->base.id, buffer->client->file);
@@ -193,6 +201,7 @@ static void drm_client_buffer_delete(struct drm_client_buffer *buffer) 


	kfree(buffer);

}

EXPORT_SYMBOL(drm_client_buffer_delete);



static struct drm_client_buffer *

drm_client_buffer_create(struct drm_client_dev *client, u32 width, u32 height,
@@ -376,7 +385,7 @@ EXPORT_SYMBOL(drm_client_buffer_vunmap); 
 *

 * This function creates a &drm_client_buffer which consists of a

 * &drm_framebuffer backed by a dumb buffer.

 * Call drm_client_framebuffer_delete() to free the buffer.

 * Call drm_client_buffer_delete() to free the buffer.

 *

 * Returns:

 * Pointer to a client buffer or an error pointer on failure.
@@ -420,19 +429,6 @@ drm_client_framebuffer_create(struct drm_client_dev *client, u32 width, u32 heig 
}

EXPORT_SYMBOL(drm_client_framebuffer_create);



/**

 * drm_client_framebuffer_delete - Delete a client framebuffer

 * @buffer: DRM client buffer (can be NULL)

 */

void drm_client_framebuffer_delete(struct drm_client_buffer *buffer)

{

	if (!buffer)

		return;



	drm_client_buffer_delete(buffer);

}

EXPORT_SYMBOL(drm_client_framebuffer_delete);



/**

 * drm_client_framebuffer_flush - Manually flush client framebuffer

 * @buffer: DRM client buffer (can be NULL)

drivers/gpu/drm/drm_fbdev_dma.c

+3 −3
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static void drm_fbdev_dma_fb_destroy(struct fb_info *info) 
	drm_fb_helper_fini(fb_helper);



	drm_client_buffer_vunmap(fb_helper->buffer);

	drm_client_framebuffer_delete(fb_helper->buffer);

	drm_client_buffer_delete(fb_helper->buffer);

	drm_client_release(&fb_helper->client);

}
@@ -88,7 +88,7 @@ static void drm_fbdev_dma_shadowed_fb_destroy(struct fb_info *info) 
	vfree(shadow);



	drm_client_buffer_vunmap(fb_helper->buffer);

	drm_client_framebuffer_delete(fb_helper->buffer);

	drm_client_buffer_delete(fb_helper->buffer);

	drm_client_release(&fb_helper->client);

}
@@ -324,7 +324,7 @@ int drm_fbdev_dma_driver_fbdev_probe(struct drm_fb_helper *fb_helper, 
	fb_helper->buffer = NULL;

	drm_client_buffer_vunmap(buffer);

err_drm_client_buffer_delete:

	drm_client_framebuffer_delete(buffer);

	drm_client_buffer_delete(buffer);

	return ret;

}

EXPORT_SYMBOL(drm_fbdev_dma_driver_fbdev_probe);

drivers/gpu/drm/drm_fbdev_shmem.c

+2 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static void drm_fbdev_shmem_fb_destroy(struct fb_info *info) 
	drm_fb_helper_fini(fb_helper);



	drm_client_buffer_vunmap(fb_helper->buffer);

	drm_client_framebuffer_delete(fb_helper->buffer);

	drm_client_buffer_delete(fb_helper->buffer);

	drm_client_release(&fb_helper->client);

}
@@ -204,7 +204,7 @@ int drm_fbdev_shmem_driver_fbdev_probe(struct drm_fb_helper *fb_helper, 
	fb_helper->buffer = NULL;

	drm_client_buffer_vunmap(buffer);

err_drm_client_buffer_delete:

	drm_client_framebuffer_delete(buffer);

	drm_client_buffer_delete(buffer);

	return ret;

}

EXPORT_SYMBOL(drm_fbdev_shmem_driver_fbdev_probe);

drivers/gpu/drm/drm_fbdev_ttm.c

+4 −4
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static void drm_fbdev_ttm_fb_destroy(struct fb_info *info) 
	fb_deferred_io_cleanup(info);

	drm_fb_helper_fini(fb_helper);

	vfree(shadow);

	drm_client_framebuffer_delete(fb_helper->buffer);

	drm_client_buffer_delete(fb_helper->buffer);



	drm_client_release(&fb_helper->client);

}
@@ -200,7 +200,7 @@ int drm_fbdev_ttm_driver_fbdev_probe(struct drm_fb_helper *fb_helper, 
	screen_buffer = vzalloc(screen_size);

	if (!screen_buffer) {

		ret = -ENOMEM;

		goto err_drm_client_framebuffer_delete;

		goto err_drm_client_buffer_delete;

	}



	info = drm_fb_helper_alloc_info(fb_helper);
@@ -233,10 +233,10 @@ int drm_fbdev_ttm_driver_fbdev_probe(struct drm_fb_helper *fb_helper, 
	drm_fb_helper_release_info(fb_helper);

err_vfree:

	vfree(screen_buffer);

err_drm_client_framebuffer_delete:

err_drm_client_buffer_delete:

	fb_helper->fb = NULL;

	fb_helper->buffer = NULL;

	drm_client_framebuffer_delete(buffer);

	drm_client_buffer_delete(buffer);

	return ret;

}

EXPORT_SYMBOL(drm_fbdev_ttm_driver_fbdev_probe);