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

Sync to v6.12-rc1.

Signed-off-by: Jani Nikula <[email protected]>

diff --combined drivers/gpu/drm/i915/i915_driver.c
index 6dc0104a3e361d76cb65c7c95b6a97b3fc4ae995,a40f05b993dad9fa29b8e1620000cd582828244e..b3eb35fa5ff8e2f919ad28b30db97824553ee481
--- 1/drivers/gpu/drm/i915/i915_driver.c
--- 2/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@@ -48,8 -48,8 +48,8 @@@
  #include "display/intel_acpi.h"
  #include "display/intel_bw.h"
  #include "display/intel_cdclk.h"
 +#include "display/intel_crtc.h"
  #include "display/intel_display_driver.h"
 -#include "display/intel_display.h"
  #include "display/intel_dmc.h"
  #include "display/intel_dp.h"
  #include "display/intel_dpt.h"
@@@ -59,7 -59,7 +59,7 @@@
  #include "display/intel_overlay.h"
  #include "display/intel_pch_refclk.h"
  #include "display/intel_pps.h"
 -#include "display/intel_sprite.h"
 +#include "display/intel_sprite_uapi.h"
  #include "display/skl_watermark.h"
  
  #include "gem/i915_gem_context.h"
@@@ -950,7 -950,7 +950,7 @@@ void i915_driver_shutdown(struct drm_i9
  
        intel_dp_mst_suspend(i915);
  
 -      intel_runtime_pm_disable_interrupts(i915);
 +      intel_irq_suspend(i915);
        intel_hpd_cancel_work(i915);
  
        if (HAS_DISPLAY(i915))
@@@ -959,7 -959,7 +959,7 @@@
        intel_encoder_suspend_all(&i915->display);
        intel_encoder_shutdown_all(&i915->display);
  
 -      intel_dmc_suspend(i915);
 +      intel_dmc_suspend(&i915->display);
  
        i915_gem_suspend(i915);
  
@@@ -1035,7 -1035,7 +1035,7 @@@ static int i915_drm_suspend(struct drm_
  
        intel_dp_mst_suspend(dev_priv);
  
 -      intel_runtime_pm_disable_interrupts(dev_priv);
 +      intel_irq_suspend(dev_priv);
        intel_hpd_cancel_work(dev_priv);
  
        if (HAS_DISPLAY(dev_priv))
@@@ -1054,7 -1054,7 +1054,7 @@@
  
        dev_priv->suspend_count++;
  
 -      intel_dmc_suspend(dev_priv);
 +      intel_dmc_suspend(display);
  
        enable_rpm_wakeref_asserts(&dev_priv->runtime_pm);
  
@@@ -1164,7 -1164,7 +1164,7 @@@ static int i915_drm_resume(struct drm_d
        /* Must be called after GGTT is resumed. */
        intel_dpt_resume(dev_priv);
  
 -      intel_dmc_resume(dev_priv);
 +      intel_dmc_resume(display);
  
        i915_restore_display(dev_priv);
        intel_pps_unlock_regs_wa(display);
@@@ -1181,7 -1181,7 +1181,7 @@@
         * Modeset enabling in intel_display_driver_init_hw() also needs working
         * interrupts.
         */
 -      intel_runtime_pm_enable_interrupts(dev_priv);
 +      intel_irq_resume(dev_priv);
  
        if (HAS_DISPLAY(dev_priv))
                drm_mode_config_reset(dev);
@@@ -1481,7 -1481,7 +1481,7 @@@ static int intel_runtime_suspend(struc
        for_each_gt(gt, dev_priv, i)
                intel_gt_runtime_suspend(gt);
  
 -      intel_runtime_pm_disable_interrupts(dev_priv);
 +      intel_irq_suspend(dev_priv);
  
        for_each_gt(gt, dev_priv, i)
                intel_uncore_suspend(gt->uncore);
@@@ -1494,7 -1494,7 +1494,7 @@@
                        "Runtime suspend failed, disabling it (%d)\n", ret);
                intel_uncore_runtime_resume(&dev_priv->uncore);
  
 -              intel_runtime_pm_enable_interrupts(dev_priv);
 +              intel_irq_resume(dev_priv);
  
                for_each_gt(gt, dev_priv, i)
                        intel_gt_runtime_resume(gt);
@@@ -1587,7 -1587,7 +1587,7 @@@ static int intel_runtime_resume(struct 
        for_each_gt(gt, dev_priv, i)
                intel_uncore_runtime_resume(gt->uncore);
  
 -      intel_runtime_pm_enable_interrupts(dev_priv);
 +      intel_irq_resume(dev_priv);
  
        /*
         * No point of rolling back things in case of an error, as the best
@@@ -1675,6 -1675,7 +1675,7 @@@ static const struct file_operations i91
  #ifdef CONFIG_PROC_FS
        .show_fdinfo = drm_show_fdinfo,
  #endif
+       .fop_flags = FOP_UNSIGNED_OFFSET,
  };
  
  static int
@@@ -1724,7 -1725,7 +1725,7 @@@ static const struct drm_ioctl_desc i915
        DRM_IOCTL_DEF_DRV(I915_GEM_SET_TILING, i915_gem_set_tiling_ioctl, DRM_RENDER_ALLOW),
        DRM_IOCTL_DEF_DRV(I915_GEM_GET_TILING, i915_gem_get_tiling_ioctl, DRM_RENDER_ALLOW),
        DRM_IOCTL_DEF_DRV(I915_GEM_GET_APERTURE, i915_gem_get_aperture_ioctl, DRM_RENDER_ALLOW),
 -      DRM_IOCTL_DEF_DRV(I915_GET_PIPE_FROM_CRTC_ID, intel_get_pipe_from_crtc_id_ioctl, 0),
 +      DRM_IOCTL_DEF_DRV(I915_GET_PIPE_FROM_CRTC_ID, intel_crtc_get_pipe_from_crtc_id_ioctl, 0),
        DRM_IOCTL_DEF_DRV(I915_GEM_MADVISE, i915_gem_madvise_ioctl, DRM_RENDER_ALLOW),
        DRM_IOCTL_DEF_DRV(I915_OVERLAY_PUT_IMAGE, intel_overlay_put_image_ioctl, DRM_MASTER),
        DRM_IOCTL_DEF_DRV(I915_OVERLAY_ATTRS, intel_overlay_attrs_ioctl, DRM_MASTER),

diff --combined drivers/gpu/drm/xe/xe_bo.h
index 2af2d0b105773af036a3f2a3855be8dc0ac7f07a,6e4be52306dfc9f85e61b0c4f767e05a80bbde93..31f4ba3bd8c17748c6fc5d58dc078d9aee64994f
--- 1/drivers/gpu/drm/xe/xe_bo.h
--- 2/drivers/gpu/drm/xe/xe_bo.h
+++ b/drivers/gpu/drm/xe/xe_bo.h
@@@ -126,11 -126,7 +126,7 @@@ static inline struct xe_bo *xe_bo_get(s
        return bo;
  }
  
- static inline void xe_bo_put(struct xe_bo *bo)
- {
-       if (bo)
-               drm_gem_object_put(&bo->ttm.base);
- }
+ void xe_bo_put(struct xe_bo *bo);
  
  static inline void __xe_bo_unset_bulk_move(struct xe_bo *bo)
  {
@@@ -316,6 -312,8 +312,6 @@@ static inline unsigned int xe_sg_segmen
        return round_down(max / 2, PAGE_SIZE);
  }
  
 -#define i915_gem_object_flush_if_display(obj)         ((void)(obj))
 -
  #if IS_ENABLED(CONFIG_DRM_XE_KUNIT_TEST)
  /**
   * xe_bo_is_mem_type - Whether the bo currently resides in the given