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

author	Jani Nikula <jani.nikula@intel.com>
	Wed, 25 Jan 2023 09:41:16 +0000 (11:41 +0200)
committer	Jani Nikula <jani.nikula@intel.com>
	Wed, 25 Jan 2023 09:41:16 +0000 (11:41 +0200)
commit	902ecddc95c68efe71be733c57e8976948537926
tree	cab01d5d8595a2fd554d1a18658e13e205294ce5	tree \| snapshot
parent	81f66500f7c9e80c01bde8eb2cb78054051058e2	commit \| diff
parent	68de345e101ce9a24e5c8849e69dd0dba2e8c9b2	commit \| diff

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

Backmerge to get the EDID handling changes.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

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

drivers/gpu/drm/i915/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_fbdev.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/skl_universal_plane.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/intel_ggtt.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/intel_ggtt_gmch.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem_gtt.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_reg.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/selftests/i915_gem.c	diff1 \|	diff2 \|	blob \| history