www.infradead.org Git - users/jedix/linux-maple.git/commit

]> www.infradead.org Git - users/jedix/linux-maple.git/commit

projects / users / jedix / linux-maple.git / commit

author	Tvrtko Ursulin <tursulin@ursulin.net>
	Wed, 5 Feb 2025 09:29:14 +0000 (09:29 +0000)
committer	Tvrtko Ursulin <tursulin@ursulin.net>
	Wed, 5 Feb 2025 09:29:14 +0000 (09:29 +0000)
commit	c771600c6af14749609b49565ffb4cac2959710d
tree	e9be426f1b32598527127fd0fa1b265a7cc83044	tree
parent	4a82ceb04ad4bbb9cc20925abccb70938313e555	commit \| diff
parent	2014c95afecee3e76ca4a56956a936e23283f05b	commit \| diff

Merge drm/drm-next into drm-intel-gt-next

We need
4ba4f1afb6a9 ("perf: Generic hotplug support for a PMU with a scope")
in order to land a i915 PMU simplification and a fix. That landed in 6.12
and we are stuck at 6.9 so lets bump things forward.

Signed-off-by: Tvrtko Ursulin <tursulin@ursulin.net>

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

drivers/gpu/drm/i915/gem/i915_gem_shmem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/intel_reset.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/intel_rps.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/intel_workarounds.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/selftest_slpc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/uc/intel_huc.c	diff1 \|	diff2 \|	blob \| history