Skip to content
Commit a1c613ae authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

Merge drm/drm-next into drm-intel-gt-next



Work that needs to land in drm-intel-gt-next depends on two patches only
present in drm-intel-next, absence of which is causing a merge conflict:

  3b918f4f ("drm/i915/pxp: Optimize GET_PARAM:PXP_STATUS")
  ac765b70 ("drm/i915/pxp/mtl: intel_pxp_init_hw needs runtime-pm inside pm-complete")

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
parents 7eeaedf7 11ae5eb5
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment