]> git.baikalelectronics.ru Git - kernel.git/commit
Merge drm/drm-next into drm-intel-next
authorJani Nikula <jani.nikula@intel.com>
Mon, 29 Aug 2022 11:44:38 +0000 (14:44 +0300)
committerJani Nikula <jani.nikula@intel.com>
Mon, 29 Aug 2022 12:14:59 +0000 (15:14 +0300)
commit3707617417a68bf6b3733714d93cbefd8fed9563
tree7758d62783f5fb81777c37d0ad4e26eea6312c0f
parentd5294cca042b6eb3783ee26d7c4a460e48cbea85
parentc6fe450ae37f1fe950d00cd91f9486af33c2d40d
Merge drm/drm-next into drm-intel-next

Sync drm-intel-next with v6.0-rc as well as recent drm-intel-gt-next.

Since drm-next does not have commit f31af6a2784a ("drm/i915/guc: remove
runtime info printing from time stamp logging") yet, only
drm-intel-gt-next, will need to do that as part of the merge here to
build.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/display/intel_display.c
drivers/gpu/drm/i915/gem/i915_gem_pages.c
drivers/gpu/drm/i915/gt/intel_gt.c
drivers/gpu/drm/i915/gt/intel_ppgtt.c
drivers/gpu/drm/i915/gt/intel_region_lmem.c
drivers/gpu/drm/i915/gt/uc/intel_guc.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gpu_error.c