]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge drm/drm-next into drm-intel-next
authorJani Nikula <jani.nikula@intel.com>
Fri, 28 Feb 2025 09:25:36 +0000 (11:25 +0200)
committerJani Nikula <jani.nikula@intel.com>
Fri, 28 Feb 2025 09:25:36 +0000 (11:25 +0200)
commit8918e180a6fd67fc9864f2ba18186b4573f8a61b
tree76a85b3cf4c35818c3b622b65da7ae3dae5ff6ac
parent67093883808b5b39894d8859937be4468eca50db
parent33e26f3544a558e7476eb221ff33173759b3a116
Merge drm/drm-next into drm-intel-next

Sync to fix conlicts between drm-xe-next and drm-intel-next.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/display/icl_dsi.c
drivers/gpu/drm/i915/display/intel_crt.c
drivers/gpu/drm/i915/display/intel_ddi.c
drivers/gpu/drm/i915/display/intel_display.c
drivers/gpu/drm/i915/display/intel_display_driver.c
drivers/gpu/drm/i915/display/intel_dp.c
drivers/gpu/drm/i915/display/intel_dp_mst.c
drivers/gpu/drm/i915/display/intel_hdmi.c
drivers/gpu/drm/i915/display/intel_lvds.c
drivers/gpu/drm/i915/display/vlv_dsi.c
drivers/gpu/drm/i915/i915_driver.c