Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git

# Conflicts:
#	drivers/gpu/drm/display/drm_bridge_connector.c
#	drivers/gpu/drm/i915/display/intel_display_driver.c
#	drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c

diff --cc Documentation/core-api/index.rst
Simple merge

diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/accel/habanalabs/common/habanalabs_drv.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
index 1d155463d044b2ad739cca256a9fa8c515b39de8,6d5d81f0dc4e7bffa6f7d0e8f2aa0daf60d06199..784b03abb3a4398b4c54436004bee9c3eede5a12
--- 1/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
--- 2/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
@@@ -2008,14 -2072,20 +2073,23 @@@ void amdgpu_gfx_enforce_isolation_ring_
        mutex_lock(&adev->enforce_isolation_mutex);
        if (adev->enforce_isolation[idx]) {
                if (adev->kfd.init_complete)
 -                      amdgpu_gfx_kfd_sch_ctrl(adev, idx, false);
 +                      sched_work = true;
        }
        mutex_unlock(&adev->enforce_isolation_mutex);
 +
 +      if (sched_work)
 +              amdgpu_gfx_kfd_sch_ctrl(adev, idx, false);
  }
  
+ /**
+  * amdgpu_gfx_enforce_isolation_ring_end_use - End use of a ring with enforced isolation
+  * @ring: Pointer to the amdgpu_ring structure
+  *
+  * Ring end_use helper implementation for gfx which serializes access to the
+  * gfx IP between kernel submission IOCTLs and KFD user queues when isolation
+  * enforcement is enabled. The kernel submission IOCTLs and KFD user queues
+  * each get a time slice when both are active.
+  */
  void amdgpu_gfx_enforce_isolation_ring_end_use(struct amdgpu_ring *ring)
  {
        struct amdgpu_device *adev = ring->adev;

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
Simple merge

diff --cc drivers/gpu/drm/bridge/ite-it6263.c
Simple merge

diff --cc drivers/gpu/drm/display/drm_bridge_connector.c
index 3a5a4f92c979accaa2a8f79ca0f15396dd579429,32108307de66560029ddf319169ac7d7e2af40d2..56f977bbe62d612f95e723122afece486e854fd4
--- 1/drivers/gpu/drm/display/drm_bridge_connector.c
--- 2/drivers/gpu/drm/display/drm_bridge_connector.c
+++ b/drivers/gpu/drm/display/drm_bridge_connector.c
@@@ -460,9 -596,8 +596,11 @@@ struct drm_connector *drm_bridge_connec
                return ERR_PTR(-EINVAL);
  
        if (bridge_connector->bridge_hdmi) {
 +              if (!connector->ycbcr_420_allowed)
 +                      supported_formats &= ~BIT(HDMI_COLORSPACE_YUV420);
 +
+               bridge = bridge_connector->bridge_hdmi;
+ 
                ret = drmm_connector_hdmi_init(drm, connector,
                                               bridge_connector->bridge_hdmi->vendor,
                                               bridge_connector->bridge_hdmi->product,

diff --cc drivers/gpu/drm/drm_connector.c
Simple merge

diff --cc drivers/gpu/drm/i915/display/intel_display_driver.c
index 62596424a9aa5b4502363a16acb20df31825781d,1aa0b298c278d402852199800c3efc7df384b93f..50ec0c3c758879681a15f6511d58cff3f634393c
--- 1/drivers/gpu/drm/i915/display/intel_display_driver.c
--- 2/drivers/gpu/drm/i915/display/intel_display_driver.c
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
@@@ -389,8 -395,9 +395,8 @@@ void intel_display_driver_resume_access
   * Returns %true if the current thread has display HW access, %false
   * otherwise.
   */
- bool intel_display_driver_check_access(struct drm_i915_private *i915)
+ bool intel_display_driver_check_access(struct intel_display *display)
  {
 -      char comm[TASK_COMM_LEN];
        char current_task[TASK_COMM_LEN + 16];
        char allowed_task[TASK_COMM_LEN + 16] = "none";
  
@@@ -399,14 -406,15 +405,14 @@@
                return true;
  
        snprintf(current_task, sizeof(current_task), "%s[%d]",
 -               get_task_comm(comm, current),
 -               task_pid_vnr(current));
 +               current->comm, task_pid_vnr(current));
  
-       if (i915->display.access.allowed_task)
+       if (display->access.allowed_task)
                snprintf(allowed_task, sizeof(allowed_task), "%s[%d]",
-                        i915->display.access.allowed_task->comm,
-                        task_pid_vnr(i915->display.access.allowed_task));
 -                       get_task_comm(comm, display->access.allowed_task),
++                       display->access.allowed_task->comm,
+                        task_pid_vnr(display->access.allowed_task));
  
-       drm_dbg_kms(&i915->drm,
+       drm_dbg_kms(display->drm,
                    "Reject display access from task %s (allowed to %s)\n",
                    current_task, allowed_task);
  

diff --cc drivers/gpu/drm/mediatek/mtk_dp.c
Simple merge

diff --cc drivers/gpu/drm/mediatek/mtk_drm_drv.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_drm.c
Simple merge

diff --cc drivers/gpu/drm/tests/drm_connector_test.c
Simple merge

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
Simple merge

diff --cc drivers/gpu/drm/xe/tests/xe_bo.c
Simple merge

diff --cc drivers/gpu/drm/xe/tests/xe_mocs.c
Simple merge

diff --cc drivers/gpu/drm/xe/xe_device.c
Simple merge

diff --cc drivers/gpu/drm/xe/xe_gt.h
Simple merge

diff --cc drivers/gpu/drm/xe/xe_hw_engine.c
Simple merge

diff --cc drivers/gpu/drm/xe/xe_oa.c
Simple merge

diff --cc init/Kconfig
Simple merge