Commit 75da46c1 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2023-07-27' of... 

Merge tag 'drm-intel-fixes-2023-07-27' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

- Use shmem for dpt objects [dpt] (Radhakrishna Sripada)
- Fix an error handling path in igt_write_huge() (Christophe JAILLET)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZMI4Mtom7pDhLB7M@tursulin-desk
parents 8e4bc028 e354f677

drivers/gpu/drm/i915/display/intel_dpt.c

+3 −1
Original line number Diff line number Diff line
@@ -166,6 +166,8 @@ struct i915_vma *intel_dpt_pin(struct i915_address_space *vm) 
		i915_vma_get(vma);

	}



	dpt->obj->mm.dirty = true;



	atomic_dec(&i915->gpu_error.pending_fb_pin);

	intel_runtime_pm_put(&i915->runtime_pm, wakeref);
@@ -261,7 +263,7 @@ intel_dpt_create(struct intel_framebuffer *fb) 
		dpt_obj = i915_gem_object_create_stolen(i915, size);

	if (IS_ERR(dpt_obj) && !HAS_LMEM(i915)) {

		drm_dbg_kms(&i915->drm, "Allocating dpt from smem\n");

		dpt_obj = i915_gem_object_create_internal(i915, size);

		dpt_obj = i915_gem_object_create_shmem(i915, size);

	}

	if (IS_ERR(dpt_obj))

		return ERR_CAST(dpt_obj);

drivers/gpu/drm/i915/gem/selftests/huge_pages.c

+4 −2
Original line number Diff line number Diff line
@@ -1246,8 +1246,10 @@ static int igt_write_huge(struct drm_i915_private *i915, 
	 * times in succession a possibility by enlarging the permutation array.

	 */

	order = i915_random_order(count * count, &prng);

	if (!order)

		return -ENOMEM;

	if (!order) {

		err = -ENOMEM;

		goto out;

	}



	max_page_size = rounddown_pow_of_two(obj->mm.page_sizes.sg);

	max = div_u64(max - size, max_page_size);