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

Merge tag 'drm-intel-gt-next-2025-02-26' of... 

Merge tag 'drm-intel-gt-next-2025-02-26' of https://gitlab.freedesktop.org/drm/i915/kernel

 into drm-next

UAPI Changes:

- Add sysfs for SLPC power profiles [slpc] (Vinay Belgaumkar)

Driver Changes:

Fixes/improvements/new stuff:

- Fix zero delta busyness issue [pmu] (Umesh Nerlige Ramappa)
- Fix page cleanup on DMA remap failure (Brian Geffon)
- Debug print LRC state entries only if the context is pinned [guc] (Daniele Ceraolo Spurio)
- Drop custom hotplug code [pmu] (Lucas De Marchi)
- Use spin_lock_irqsave() in interruptible context [guc] (Krzysztof Karas)
- Add wait on depth stall done bit handling [gen12] (Juha-Pekka Heikkila)

Miscellaneous:

- Change throttle criteria for rps [selftest] (Raag Jadav)
- Add debug print about hw config table size (John Harrison)
- Include requested frequency in slow firmware load messages [uc] (John Harrison)
- Remove i915_pmu_event_event_idx() [pmu] (Lucas De Marchi)
- Remove unused live_context_for_engine (Dr. David Alan Gilbert)
- Add Wa_22010465259 in its respective WA list (Ranu Maurya)
- Correct frequency handling in RPS power measurement [selftests] (Sk Anirban)
- Add helper function slpc_measure_power [guc/slpc] (Sk Anirban)
- Revert "drm/i915/gt: Log reason for setting TAINT_WARN at reset" [gt] (Sebastian Brzezinka)
- Avoid using uninitialized context [selftests] (Krzysztof Karas)
- Use struct_size() helper in kmalloc() (luoqing)
- Use prandom in selftest [selftests] (Markus Theil)
- Replace kmap with its safer kmap_local_page counterpart [gt] (Andi Shyti)

Merges:

- Merge drm/drm-next into drm-intel-gt-next (Tvrtko Ursulin)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Tvrtko Ursulin <tursulin@igalia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/Z77NLt2mR7SqxJ4u@linux
parents 4e64a620 7ded94bd

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

+0 −38
Original line number Diff line number Diff line
@@ -107,44 +107,6 @@ live_context(struct drm_i915_private *i915, struct file *file) 
	return ERR_PTR(err);

}



struct i915_gem_context *

live_context_for_engine(struct intel_engine_cs *engine, struct file *file)

{

	struct i915_gem_engines *engines;

	struct i915_gem_context *ctx;

	struct intel_sseu null_sseu = {};

	struct intel_context *ce;



	engines = alloc_engines(1);

	if (!engines)

		return ERR_PTR(-ENOMEM);



	ctx = live_context(engine->i915, file);

	if (IS_ERR(ctx)) {

		__free_engines(engines, 0);

		return ctx;

	}



	ce = intel_context_create(engine);

	if (IS_ERR(ce)) {

		__free_engines(engines, 0);

		return ERR_CAST(ce);

	}



	intel_context_set_gem(ce, ctx, null_sseu);

	engines->engines[0] = ce;

	engines->num_engines = 1;



	mutex_lock(&ctx->engines_mutex);

	i915_gem_context_set_user_engines(ctx);

	engines = rcu_replace_pointer(ctx->engines, engines, 1);

	mutex_unlock(&ctx->engines_mutex);



	engines_idle_release(ctx, engines);



	return ctx;

}



struct i915_gem_context *

kernel_context(struct drm_i915_private *i915,

	       struct i915_address_space *vm)

drivers/gpu/drm/i915/gem/selftests/mock_context.h

+0 −3
Original line number Diff line number Diff line
@@ -23,9 +23,6 @@ void mock_context_close(struct i915_gem_context *ctx); 
struct i915_gem_context *

live_context(struct drm_i915_private *i915, struct file *file);



struct i915_gem_context *

live_context_for_engine(struct intel_engine_cs *engine, struct file *file);



struct i915_gem_context *kernel_context(struct drm_i915_private *i915,

					struct i915_address_space *vm);

void kernel_context_close(struct i915_gem_context *ctx);

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

+1 −2
Original line number Diff line number Diff line
@@ -103,8 +103,7 @@ static struct dma_buf *mock_dmabuf(int npages) 
	struct dma_buf *dmabuf;

	int i;



	mock = kmalloc(sizeof(*mock) + npages * sizeof(struct page *),

		       GFP_KERNEL);

	mock = kmalloc(struct_size(mock, pages, npages), GFP_KERNEL);

	if (!mock)

		return ERR_PTR(-ENOMEM);

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

+2 −2
Original line number Diff line number Diff line
@@ -750,7 +750,7 @@ static void swizzle_page(struct page *page) 
	char *vaddr;

	int i;



	vaddr = kmap(page);

	vaddr = kmap_local_page(page);



	for (i = 0; i < PAGE_SIZE; i += 128) {

		memcpy(temp, &vaddr[i], 64);
@@ -758,7 +758,7 @@ static void swizzle_page(struct page *page) 
		memcpy(&vaddr[i + 64], temp, 64);

	}



	kunmap(page);

	kunmap_local(vaddr);

}



/**

drivers/gpu/drm/i915/gt/intel_gt_regs.h

+3 −0
Original line number Diff line number Diff line
@@ -409,6 +409,9 @@ 
#define GEN7_SO_PRIM_STORAGE_NEEDED(n)		_MMIO(0x5240 + (n) * 8)

#define GEN7_SO_PRIM_STORAGE_NEEDED_UDW(n)	_MMIO(0x5240 + (n) * 8 + 4)



#define GEN8_WM_CHICKEN2			MCR_REG(0x5584)

#define   WAIT_ON_DEPTH_STALL_DONE_DISABLE	REG_BIT(5)



#define GEN9_WM_CHICKEN3			_MMIO(0x5588)

#define   GEN9_FACTOR_IN_CLR_VAL_HIZ		(1 << 9)