www.infradead.org Git - users/dwmw2/linux.git/commit

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

projects / users / dwmw2 / linux.git / commit

author	Rodrigo Vivi <rodrigo.vivi@intel.com>
	Thu, 21 Apr 2022 17:44:55 +0000 (13:44 -0400)
committer	Rodrigo Vivi <rodrigo.vivi@intel.com>
	Thu, 21 Apr 2022 17:48:26 +0000 (13:48 -0400)
commit	e1e1f4e32594d117d9f90e7743d33a019139fc9f
tree	01bfc642ee798e3e9daedfdaecd168bec4a764b2	tree
parent	0f9fc0c1eff0120403f95d4f61e330654fbe64ed	commit \| diff
parent	c54b39a565227538c52ead2349eb17d54aadd6f7	commit \| diff

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

In order to get the GSC Support merged on drm-intel-gt-next
in a clean fashion we needed this ATS-M patch to avoid
conflict in i915_pci.c:

commit 412c942bdfae ("drm/i915/ats-m: add ATS-M platform info")

--

Fixing a silent conflict on drivers/gpu/drm/i915/gt/intel_gt_gmch.c:
- if (!intel_vtd_active(i915))
+ if (!i915_vtd_active(i915))

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

39 files changed:

Documentation/gpu/i915.rst	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_dpt.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_fb.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_plane_initial.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gem/i915_gem_context.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gem/i915_gem_lmem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gem/i915_gem_object.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gem/i915_gem_region.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gem/i915_gem_shmem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gem/i915_gem_stolen.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/intel_engine_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/intel_execlists_submission.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/intel_ggtt.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/intel_gt_gmch.c	diff1 \|	\|	blob \| history
drivers/gpu/drm/i915/gt/intel_gt_pm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/intel_gt_regs.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/intel_gtt.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/intel_gtt.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/intel_rc6.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_sseu.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/intel_sseu_debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/uc/intel_guc_log.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_driver.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gpu_error.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gpu_error.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_params.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_reg.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_memory_region.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_memory_region.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_uncore.c	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

Documentation/gpu/i915.rst	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_dpt.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_fb.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_plane_initial.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gem/i915_gem_context.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gem/i915_gem_lmem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gem/i915_gem_object.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gem/i915_gem_region.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gem/i915_gem_shmem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gem/i915_gem_stolen.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/intel_engine_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/intel_execlists_submission.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/intel_ggtt.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/intel_gt_gmch.c	diff1 \|	\|	blob \| history
drivers/gpu/drm/i915/gt/intel_gt_pm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/intel_gt_regs.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/intel_gtt.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/intel_gtt.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/intel_rc6.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_sseu.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/intel_sseu_debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/uc/intel_guc_log.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_driver.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gpu_error.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gpu_error.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_params.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_reg.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_memory_region.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_memory_region.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_uncore.c	diff1 \|	diff2 \|	blob \| history