Merge drm/drm-next into drm-intel-next
authorJani Nikula <jani.nikula@intel.com>
Mon, 15 Jan 2024 07:38:05 +0000 (09:38 +0200)
committerJani Nikula <jani.nikula@intel.com>
Mon, 15 Jan 2024 07:38:05 +0000 (09:38 +0200)
commit0ea5c948cb64bab5bc7a5516774eb8536f05aa0d
tree8437ec451643a0fa3e7e8f3cab5c851dcb5a9c4b
parent78d49aaa36bd9b736bbd4b2944935e6714c4bfe6
parent205e18c13545ab43cc4fe4930732b4feef551198
Merge drm/drm-next into drm-intel-next

Backmerge to bring Xe driver to drm-intel-next.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/display/intel_display.c
drivers/gpu/drm/i915/display/intel_display_core.h
drivers/gpu/drm/i915/display/intel_dp.c
drivers/gpu/drm/i915/display/intel_sdvo.c
drivers/gpu/drm/i915/i915_driver.c
include/drm/display/drm_dp.h
include/drm/drm_print.h