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

airlied · airlied · commit a37cd98cd56e · 2024-07-26T06:41:03.000+10:00
- Do not consider preemption during execlists_dequeue for gen8 [gt] (Nitin Gote) - Allow NULL memory region (Jonathan Cavitt) Signed-off-by: Dave Airlie <airlied@redhat.com> From: Tvrtko Ursulin <tursulin@igalia.com> Link: https://patchwork.freedesktop.org/patch/msgid/ZqICQzyzm/6hDWy4@linux
diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
@@ -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)
diff --git a/drivers/gpu/drm/i915/intel_memory_region.c b/drivers/gpu/drm/i915/intel_memory_region.c
@@ -368,8 +368,10 @@ int intel_memory_regions_hw_probe(struct drm_i915_private *i915)
 			goto out_cleanup;
 		}
 
-		mem->id = i;
-		i915->mm.regions[i] = mem;
+		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++) {

Original file line number	Diff line number	Diff line change
`@@ -3315,11 +3315,7 @@ static void remove_from_engine(struct i915_request *rq)`
`3315`	`3315`
`3316`	`3316`	`static bool can_preempt(struct intel_engine_cs *engine)`
`3317`	`3317`	`{`
`3318`		`- if (GRAPHICS_VER(engine->i915) > 8)`
`3319`		`- return true;`
`3320`		`-`
`3321`		`- /* GPGPU on bdw requires extra w/a; not implemented */`
`3322`		`- return engine->class != RENDER_CLASS;`
	`3318`	`+ return GRAPHICS_VER(engine->i915) > 8;`
`3323`	`3319`	`}`
`3324`	`3320`
`3325`	`3321`	`static void kick_execlists(const struct i915_request *rq, int prio)`
Original file line number	Diff line number	Diff line change
`@@ -368,8 +368,10 @@ int intel_memory_regions_hw_probe(struct drm_i915_private *i915)`
`368`	`368`	`goto out_cleanup;`
`369`	`369`	`}`
`370`	`370`
`371`		`- mem->id = i;`
`372`		`- i915->mm.regions[i] = mem;`
	`371`	`+ if (mem) { /* Skip on non-fatal errors */`
	`372`	`+ mem->id = i;`
	`373`	`+ i915->mm.regions[i] = mem;`
	`374`	`+ }`
`373`	`375`	`}`
`374`	`376`
`375`	`377`	`for (i = 0; i < ARRAY_SIZE(i915->mm.regions); i++) {`