]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge drm/drm-next into drm-intel-next
authorJani Nikula <jani.nikula@intel.com>
Thu, 1 Aug 2024 10:06:09 +0000 (13:06 +0300)
committerJani Nikula <jani.nikula@intel.com>
Thu, 1 Aug 2024 10:06:09 +0000 (13:06 +0300)
Sync with v6.11-rc1 in general, and specifically get the new
BACKLIGHT_POWER_ constants for power states.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
1  2 
drivers/gpu/drm/display/drm_dp_mst_topology.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/xe/display/xe_hdcp_gsc.c

Simple merge