Merge drm/drm-next into drm-xe-next

Backmerging drm-next in order to get up-to-date and in particular
to access commit 9ca5facd0400f610f3f7f71aeb7fc0b949a48c67.

Signed-off-by: Thomas Hellström <[email protected]>

diff --cc drivers/gpu/drm/xe/Kconfig
Simple merge

diff --cc drivers/gpu/drm/xe/Makefile
Simple merge

diff --cc drivers/gpu/drm/xe/tests/xe_migrate.c
index 1332832e2f97b4c0ffc6a5f06b0457eb202c7659,c347e2c29f81f133c7766a5089811edb046b0085..977d5f4e449002e5d001a9c21e2b1d2489596130
--- 1/drivers/gpu/drm/xe/tests/xe_migrate.c
--- 2/drivers/gpu/drm/xe/tests/xe_migrate.c
+++ b/drivers/gpu/drm/xe/tests/xe_migrate.c
@@@ -113,10 -112,10 +113,10 @@@ static void test_copy(struct xe_migrat
                                                   bo->size,
                                                   ttm_bo_type_kernel,
                                                   region |
 -                                                 XE_BO_NEEDS_CPU_ACCESS);
 +                                                 XE_BO_FLAG_NEEDS_CPU_ACCESS);
        if (IS_ERR(remote)) {
-               KUNIT_FAIL(test, "Failed to allocate remote bo for %s: %li\n",
-                          str, PTR_ERR(remote));
+               KUNIT_FAIL(test, "Failed to allocate remote bo for %s: %pe\n",
+                          str, remote);
                return;
        }
  

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

diff --cc drivers/gpu/drm/xe/xe_pm.c
index f1fc83845c01fc878bde7a32f81118d543b5b696,53b3b0b019acd85fe48e375005e9b36149edad13..f3fd003b694440b50549e32c516a51fc024d976a
--- 1/drivers/gpu/drm/xe/xe_pm.c
--- 2/drivers/gpu/drm/xe/xe_pm.c
+++ b/drivers/gpu/drm/xe/xe_pm.c
@@@ -413,99 -341,22 +413,99 @@@ out
        return err;
  }
  
 -int xe_pm_runtime_get(struct xe_device *xe)
 +/**
 + * xe_pm_runtime_get - Get a runtime_pm reference and resume synchronously
 + * @xe: xe device instance
 + */
 +void xe_pm_runtime_get(struct xe_device *xe)
  {
 -      return pm_runtime_get_sync(xe->drm.dev);
 +      pm_runtime_get_noresume(xe->drm.dev);
 +
 +      if (xe_pm_read_callback_task(xe) == current)
 +              return;
 +
 +      pm_runtime_resume(xe->drm.dev);
  }
  
 -int xe_pm_runtime_put(struct xe_device *xe)
 +/**
 + * xe_pm_runtime_put - Put the runtime_pm reference back and mark as idle
 + * @xe: xe device instance
 + */
 +void xe_pm_runtime_put(struct xe_device *xe)
  {
 -      pm_runtime_mark_last_busy(xe->drm.dev);
 -      return pm_runtime_put(xe->drm.dev);
 +      if (xe_pm_read_callback_task(xe) == current) {
 +              pm_runtime_put_noidle(xe->drm.dev);
 +      } else {
 +              pm_runtime_mark_last_busy(xe->drm.dev);
 +              pm_runtime_put(xe->drm.dev);
 +      }
  }
  
 +/**
 + * xe_pm_runtime_get_ioctl - Get a runtime_pm reference before ioctl
 + * @xe: xe device instance
 + *
 + * Returns: Any number greater than or equal to 0 for success, negative error
 + * code otherwise.
 + */
 +int xe_pm_runtime_get_ioctl(struct xe_device *xe)
 +{
 +      if (WARN_ON(xe_pm_read_callback_task(xe) == current))
 +              return -ELOOP;
 +
 +      return pm_runtime_get_sync(xe->drm.dev);
 +}
 +
 +/**
 + * xe_pm_runtime_get_if_active - Get a runtime_pm reference if device active
 + * @xe: xe device instance
 + *
 + * Returns: Any number greater than or equal to 0 for success, negative error
 + * code otherwise.
 + */
  int xe_pm_runtime_get_if_active(struct xe_device *xe)
  {
-       return pm_runtime_get_if_active(xe->drm.dev, true);
+       return pm_runtime_get_if_active(xe->drm.dev);
  }
  
 +/**
 + * xe_pm_runtime_get_if_in_use - Get a runtime_pm reference and resume if needed
 + * @xe: xe device instance
 + *
 + * Returns: True if device is awake and the reference was taken, false otherwise.
 + */
 +bool xe_pm_runtime_get_if_in_use(struct xe_device *xe)
 +{
 +      if (xe_pm_read_callback_task(xe) == current) {
 +              /* The device is awake, grab the ref and move on */
 +              pm_runtime_get_noresume(xe->drm.dev);
 +              return true;
 +      }
 +
 +      return pm_runtime_get_if_in_use(xe->drm.dev) > 0;
 +}
 +
 +/**
 + * xe_pm_runtime_resume_and_get - Resume, then get a runtime_pm ref if awake.
 + * @xe: xe device instance
 + *
 + * Returns: True if device is awake and the reference was taken, false otherwise.
 + */
 +bool xe_pm_runtime_resume_and_get(struct xe_device *xe)
 +{
 +      if (xe_pm_read_callback_task(xe) == current) {
 +              /* The device is awake, grab the ref and move on */
 +              pm_runtime_get_noresume(xe->drm.dev);
 +              return true;
 +      }
 +
 +      return pm_runtime_resume_and_get(xe->drm.dev) >= 0;
 +}
 +
 +/**
 + * xe_pm_assert_unbounded_bridge - Disable PM on unbounded pcie parent bridge
 + * @xe: xe device instance
 + */
  void xe_pm_assert_unbounded_bridge(struct xe_device *xe)
  {
        struct pci_dev *pdev = to_pci_dev(xe->drm.dev);

diff --cc drivers/gpu/drm/xe/xe_vm.c
index 9c6f653992dd003914d52e1ffa783904efcc9475,f88faef4142bde018f336d33d3e2eed726a4bc29..2dbba55e7785a281476bd5e60805bf60cdf75a3f
--- 1/drivers/gpu/drm/xe/xe_vm.c
--- 2/drivers/gpu/drm/xe/xe_vm.c
+++ b/drivers/gpu/drm/xe/xe_vm.c
@@@ -858,18 -917,25 +858,23 @@@ static struct xe_vma *xe_vma_create(str
  static void xe_vma_destroy_late(struct xe_vma *vma)
  {
        struct xe_vm *vm = xe_vma_vm(vma);
 -      struct xe_device *xe = vm->xe;
 -      bool read_only = xe_vma_read_only(vma);
 +
 +      if (vma->ufence) {
 +              xe_sync_ufence_put(vma->ufence);
 +              vma->ufence = NULL;
 +      }
  
+       if (vma->ufence) {
+               xe_sync_ufence_put(vma->ufence);
+               vma->ufence = NULL;
+       }
+ 
        if (xe_vma_is_userptr(vma)) {
 -              struct xe_userptr *userptr = &to_userptr_vma(vma)->userptr;
 +              struct xe_userptr_vma *uvma = to_userptr_vma(vma);
 +              struct xe_userptr *userptr = &uvma->userptr;
  
 -              if (userptr->sg) {
 -                      dma_unmap_sgtable(xe->drm.dev,
 -                                        userptr->sg,
 -                                        read_only ? DMA_TO_DEVICE :
 -                                        DMA_BIDIRECTIONAL, 0);
 -                      sg_free_table(userptr->sg);
 -                      userptr->sg = NULL;
 -              }
 +              if (userptr->sg)
 +                      xe_hmm_userptr_free_sg(uvma);
  
                /*
                 * Since userptr pages are not pinned, we can't remove

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