Merge drm/drm-next into drm-intel-next
authorJani Nikula <jani.nikula@intel.com>
Mon, 16 Aug 2021 06:11:17 +0000 (09:11 +0300)
committerJani Nikula <jani.nikula@intel.com>
Mon, 16 Aug 2021 06:11:17 +0000 (09:11 +0300)
commitb2eb7d716426fe056596761cd371005d64e9caec
tree436d0566cf4bc900522c9dbf1e203234ef65b2f7
parent2817efaeb608421d8f6fe7939826c35a852644e9
parent2819cf0e7dbe45a2bccf2f6c60fe6a27b299cc3e
Merge drm/drm-next into drm-intel-next

Catch up with drm core changes.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/display/intel_display.c
drivers/gpu/drm/i915/i915_gpu_error.c
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/i915_reg.h