Commit 7be19f93 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2025-12-31' of... 

Merge tag 'drm-intel-fixes-2025-12-31' of https://gitlab.freedesktop.org/drm/i915/kernel

 into drm-fixes

drm/i915 fixes for v6.19-rc4:
- Fix eb_lookup_vmas() failure path

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patch.msgid.link/4e79f041395bb8bcc9b2a76bb98b5e3df1c1c3eb@intel.com
parents 9abfe0b2 4fe2bd19

drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c

+17 −20
Original line number Diff line number Diff line
@@ -951,13 +951,13 @@ static int eb_lookup_vmas(struct i915_execbuffer *eb) 
		vma = eb_lookup_vma(eb, eb->exec[i].handle);

		if (IS_ERR(vma)) {

			err = PTR_ERR(vma);

			goto err;

			return err;

		}



		err = eb_validate_vma(eb, &eb->exec[i], vma);

		if (unlikely(err)) {

			i915_vma_put(vma);

			goto err;

			return err;

		}



		err = eb_add_vma(eb, &current_batch, i, vma);
@@ -966,19 +966,8 @@ static int eb_lookup_vmas(struct i915_execbuffer *eb) 


		if (i915_gem_object_is_userptr(vma->obj)) {

			err = i915_gem_object_userptr_submit_init(vma->obj);

			if (err) {

				if (i + 1 < eb->buffer_count) {

					/*

					 * Execbuffer code expects last vma entry to be NULL,

					 * since we already initialized this entry,

					 * set the next value to NULL or we mess up

					 * cleanup handling.

					 */

					eb->vma[i + 1].vma = NULL;

				}



			if (err)

				return err;

			}



			eb->vma[i].flags |= __EXEC_OBJECT_USERPTR_INIT;

			eb->args->flags |= __EXEC_USERPTR_USED;
@@ -986,10 +975,6 @@ static int eb_lookup_vmas(struct i915_execbuffer *eb) 
	}



	return 0;



err:

	eb->vma[i].vma = NULL;

	return err;

}



static int eb_lock_vmas(struct i915_execbuffer *eb)
@@ -3375,7 +3360,8 @@ i915_gem_do_execbuffer(struct drm_device *dev, 


	eb.exec = exec;

	eb.vma = (struct eb_vma *)(exec + args->buffer_count + 1);

	eb.vma[0].vma = NULL;

	memset(eb.vma, 0, (args->buffer_count + 1) * sizeof(struct eb_vma));



	eb.batch_pool = NULL;



	eb.invalid_flags = __EXEC_OBJECT_UNKNOWN_FLAGS;
@@ -3584,7 +3570,18 @@ i915_gem_execbuffer2_ioctl(struct drm_device *dev, void *data, 
	if (err)

		return err;



	/* Allocate extra slots for use by the command parser */

	/*

	 * Allocate extra slots for use by the command parser.

	 *

	 * Note that this allocation handles two different arrays (the

	 * exec2_list array, and the eventual eb.vma array introduced in

	 * i915_gem_do_execbuffer()), that reside in virtually contiguous

	 * memory. Also note that the allocation intentionally doesn't fill the

	 * area with zeros, because the exec2_list part doesn't need to be, as

	 * it's immediately overwritten by user data a few lines below.

	 * However, the eb.vma part is explicitly zeroed later in

	 * i915_gem_do_execbuffer().

	 */

	exec2_list = kvmalloc_array(count + 2, eb_element_size(),

				    __GFP_NOWARN | GFP_KERNEL);

	if (exec2_list == NULL) {