git.maquefel.me Git - linux.git/commit

author	Rodrigo Vivi <rodrigo.vivi@intel.com>
	Mon, 14 Nov 2022 19:32:34 +0000 (14:32 -0500)
committer	Rodrigo Vivi <rodrigo.vivi@intel.com>
	Mon, 14 Nov 2022 19:32:34 +0000 (14:32 -0500)
commit	002c6ca75289a4ac4f6738213dd2d258704886e4
tree	d99ec659974b2121cef3e06f54a97d719d0a94dd	tree \| snapshot
parent	801543b2593b04eef974a73d3ea03e7efbd5ffae	commit \| diff
parent	c02f20d38fb90eba606277874581db124ace42c4	commit \| diff

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

Catch up on 6.1-rc cycle in order to solve the intel_backlight
conflict on linux-next.

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

26 files changed:

drivers/gpu/drm/i915/display/intel_backlight.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_display.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_display_types.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_hdmi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_lpe_audio.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.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_gt.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_workarounds.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gvt/handlers.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gvt/mmio_context.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gpu_error.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_irq.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_perf.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_reg.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_reg_defs.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_trace.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_gvt_mmio_table.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_pm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_uncore.c	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

drivers/gpu/drm/i915/display/intel_backlight.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_display.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_display_types.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_hdmi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_lpe_audio.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.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_gt.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_workarounds.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gvt/handlers.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gvt/mmio_context.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gpu_error.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_irq.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_perf.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_reg.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_reg_defs.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_trace.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_gvt_mmio_table.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_pm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_uncore.c	diff1 \|	diff2 \|	blob \| history