Commit 064d491f authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2022-08-25' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



Short summary of fixes pull:

 * gem: Fixes handle release leak
 * nouveau: Fix fencing when moving BO
 * vc4: HDMI fixes
 * Backmerging for v6.0-rc1

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YwclSWheC+Ai+u+v@linux-uq9g
parents 1c23f9e6 6b04ce96

drivers/gpu/drm/drm_gem.c

+1 −16
Original line number Diff line number Diff line
@@ -168,21 +168,6 @@ void drm_gem_private_object_init(struct drm_device *dev, 
}

EXPORT_SYMBOL(drm_gem_private_object_init);



static void

drm_gem_remove_prime_handles(struct drm_gem_object *obj, struct drm_file *filp)

{

	/*

	 * Note: obj->dma_buf can't disappear as long as we still hold a

	 * handle reference in obj->handle_count.

	 */

	mutex_lock(&filp->prime.lock);

	if (obj->dma_buf) {

		drm_prime_remove_buf_handle_locked(&filp->prime,

						   obj->dma_buf);

	}

	mutex_unlock(&filp->prime.lock);

}



/**

 * drm_gem_object_handle_free - release resources bound to userspace handles

 * @obj: GEM object to clean up.
@@ -253,7 +238,7 @@ drm_gem_object_release_handle(int id, void *ptr, void *data) 
	if (obj->funcs->close)

		obj->funcs->close(obj, file_priv);



	drm_gem_remove_prime_handles(obj, file_priv);

	drm_prime_remove_buf_handle(&file_priv->prime, id);

	drm_vma_node_revoke(&obj->vma_node, file_priv);



	drm_gem_object_handle_put_unlocked(obj);

drivers/gpu/drm/drm_internal.h

+2 −2
Original line number Diff line number Diff line
@@ -74,8 +74,8 @@ int drm_prime_fd_to_handle_ioctl(struct drm_device *dev, void *data, 


void drm_prime_init_file_private(struct drm_prime_file_private *prime_fpriv);

void drm_prime_destroy_file_private(struct drm_prime_file_private *prime_fpriv);

void drm_prime_remove_buf_handle_locked(struct drm_prime_file_private *prime_fpriv,

					struct dma_buf *dma_buf);

void drm_prime_remove_buf_handle(struct drm_prime_file_private *prime_fpriv,

				 uint32_t handle);



/* drm_drv.c */

struct drm_minor *drm_minor_acquire(unsigned int minor_id);

drivers/gpu/drm/drm_prime.c

+12 −8
Original line number Diff line number Diff line
@@ -190,29 +190,33 @@ static int drm_prime_lookup_buf_handle(struct drm_prime_file_private *prime_fpri 
	return -ENOENT;

}



void drm_prime_remove_buf_handle_locked(struct drm_prime_file_private *prime_fpriv,

					struct dma_buf *dma_buf)

void drm_prime_remove_buf_handle(struct drm_prime_file_private *prime_fpriv,

				 uint32_t handle)

{

	struct rb_node *rb;



	rb = prime_fpriv->dmabufs.rb_node;

	mutex_lock(&prime_fpriv->lock);



	rb = prime_fpriv->handles.rb_node;

	while (rb) {

		struct drm_prime_member *member;



		member = rb_entry(rb, struct drm_prime_member, dmabuf_rb);

		if (member->dma_buf == dma_buf) {

		member = rb_entry(rb, struct drm_prime_member, handle_rb);

		if (member->handle == handle) {

			rb_erase(&member->handle_rb, &prime_fpriv->handles);

			rb_erase(&member->dmabuf_rb, &prime_fpriv->dmabufs);



			dma_buf_put(dma_buf);

			dma_buf_put(member->dma_buf);

			kfree(member);

			return;

		} else if (member->dma_buf < dma_buf) {

			break;

		} else if (member->handle < handle) {

			rb = rb->rb_right;

		} else {

			rb = rb->rb_left;

		}

	}



	mutex_unlock(&prime_fpriv->lock);

}



void drm_prime_init_file_private(struct drm_prime_file_private *prime_fpriv)

drivers/gpu/drm/nouveau/nouveau_bo.c

+9 −0
Original line number Diff line number Diff line
@@ -820,6 +820,15 @@ nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict, 
		if (ret == 0) {

			ret = nouveau_fence_new(chan, false, &fence);

			if (ret == 0) {

				/* TODO: figure out a better solution here

				 *

				 * wait on the fence here explicitly as going through

				 * ttm_bo_move_accel_cleanup somehow doesn't seem to do it.

				 *

				 * Without this the operation can timeout and we'll fallback to a

				 * software copy, which might take several minutes to finish.

				 */

				nouveau_fence_wait(fence, false, false);

				ret = ttm_bo_move_accel_cleanup(bo,

								&fence->base,

								evict, false,

drivers/gpu/drm/vc4/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ config DRM_VC4 
	depends on DRM

	depends on SND && SND_SOC

	depends on COMMON_CLK

	depends on PM

	select DRM_DISPLAY_HDMI_HELPER

	select DRM_DISPLAY_HELPER

	select DRM_KMS_HELPER