Commit a37cd98c authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-fixes-2024-07-25' of... 

Merge tag 'drm-intel-next-fixes-2024-07-25' of https://gitlab.freedesktop.org/drm/i915/kernel

 into drm-next

- Do not consider preemption during execlists_dequeue for gen8 [gt] (Nitin Gote)
- Allow NULL memory region (Jonathan Cavitt)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Tvrtko Ursulin <tursulin@igalia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZqICQzyzm/6hDWy4@linux
parents 627a24f5 26720dd2

drivers/gpu/drm/i915/gt/intel_execlists_submission.c

+1 −5
Original line number Diff line number Diff line
@@ -3315,11 +3315,7 @@ static void remove_from_engine(struct i915_request *rq) 


static bool can_preempt(struct intel_engine_cs *engine)

{

	if (GRAPHICS_VER(engine->i915) > 8)

		return true;



	/* GPGPU on bdw requires extra w/a; not implemented */

	return engine->class != RENDER_CLASS;

	return GRAPHICS_VER(engine->i915) > 8;

}



static void kick_execlists(const struct i915_request *rq, int prio)

drivers/gpu/drm/i915/intel_memory_region.c

+4 −2
Original line number Diff line number Diff line
@@ -368,9 +368,11 @@ int intel_memory_regions_hw_probe(struct drm_i915_private *i915) 
			goto out_cleanup;

		}



		if (mem) { /* Skip on non-fatal errors */

			mem->id = i;

			i915->mm.regions[i] = mem;

		}

	}



	for (i = 0; i < ARRAY_SIZE(i915->mm.regions); i++) {

		struct intel_memory_region *mem = i915->mm.regions[i];