Merge tag 'drm-intel-gt-next-2022-11-03' of git://anongit.freedesktop.org/drm/drm...

Driver Changes:

- Fix for #7306: [Arc A380] white flickering when using arc as a
  secondary gpu (Matt A)
- Add Wa_18017747507 for DG2 (Wayne)
- Avoid spurious WARN on DG1 due to incorrect cache_dirty flag
  (Niranjana, Matt A)
- Corrections to CS timestamp support for Gen5 and earlier (Ville)

- Fix a build error used with clang compiler on hwmon (GG)
- Improvements to LMEM handling with RPM (Anshuman, Matt A)
- Cleanups in dmabuf code (Mike)

- Selftest improvements (Matt A)

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/Y2N11wu175p6qeEN@jlahtine-mobl.ger.corp.intel.com

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/gpu/drm/i915/display/intel_lpe_audio.c
Simple merge

diff --cc drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
Simple merge

diff --cc drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
Simple merge

diff --cc drivers/gpu/drm/i915/gem/i915_gem_object.c
Simple merge

diff --cc drivers/gpu/drm/i915/gem/i915_gem_ttm.c
Simple merge

diff --cc drivers/gpu/drm/i915/gem/i915_gem_userptr.c
Simple merge

diff --cc drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c
Simple merge

diff --cc drivers/gpu/drm/i915/gt/intel_gt_regs.h
index 5a3a25838fff2706771616b6c770eafdc4fe6b87,dfbf093ec5621f55b3e9d728d9d1ddbf767b8663..70177d3f2e945b58a509b35fc40c325628cad6e3
--- 1/drivers/gpu/drm/i915/gt/intel_gt_regs.h
--- 2/drivers/gpu/drm/i915/gt/intel_gt_regs.h
+++ b/drivers/gpu/drm/i915/gt/intel_gt_regs.h
@@@ -39,12 -52,14 +52,17 @@@
  #define FORCEWAKE_ACK_RENDER_GEN9             _MMIO(0xd84)
  #define FORCEWAKE_ACK_MEDIA_GEN9              _MMIO(0xd88)
  
+ #define FORCEWAKE_ACK_GSC                     _MMIO(0xdf8)
+ #define FORCEWAKE_ACK_GT_MTL                  _MMIO(0xdfc)
+ 
 +#define GMD_ID_GRAPHICS                               _MMIO(0xd8c)
 +#define GMD_ID_MEDIA                          _MMIO(MTL_MEDIA_GSI_BASE + 0xd8c)
 +
  #define MCFG_MCR_SELECTOR                     _MMIO(0xfd0)
+ #define MTL_MCR_SELECTOR                      _MMIO(0xfd4)
  #define SF_MCR_SELECTOR                               _MMIO(0xfd8)
  #define GEN8_MCR_SELECTOR                     _MMIO(0xfdc)
+ #define GAM_MCR_SELECTOR                      _MMIO(0xfe0)
  #define   GEN8_MCR_SLICE(slice)                       (((slice) & 3) << 26)
  #define   GEN8_MCR_SLICE_MASK                 GEN8_MCR_SLICE(3)
  #define   GEN8_MCR_SUBSLICE(subslice)         (((subslice) & 3) << 24)

diff --cc drivers/gpu/drm/i915/gt/intel_workarounds.c
Simple merge

diff --cc drivers/gpu/drm/i915/gvt/handlers.c
Simple merge

diff --cc drivers/gpu/drm/i915/gvt/mmio_context.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_driver.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.h
Simple merge

diff --cc drivers/gpu/drm/i915/i915_pci.c
index 9486127a44f7945957505d992addae22fd4b9dfa,6b22fb506aa994dcf92fa38b816b21af9642a9b4..211913be40cec6b4f83d58f2406eed15ef88b7a4
--- 1/drivers/gpu/drm/i915/i915_pci.c
--- 2/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@@ -1064,9 -1065,7 +1065,8 @@@ static const struct intel_device_info x
        .has_64k_pages = 1, \
        .has_guc_deprivilege = 1, \
        .has_heci_pxp = 1, \
-       .needs_compact_pt = 1, \
        .has_media_ratio_mode = 1, \
 +      .display.has_cdclk_squash = 1, \
        .__runtime.platform_engine_mask = \
                BIT(RCS0) | BIT(BCS0) | \
                BIT(VECS0) | BIT(VECS1) | \
@@@ -1145,7 -1144,7 +1145,8 @@@ static const struct intel_device_info m
        .display.has_modular_fia = 1,
        .extra_gt_list = xelpmp_extra_gt,
        .has_flat_ccs = 0,
 +      .has_gmd_id = 1,
+       .has_mslice_steering = 0,
        .has_snoop = 1,
        .__runtime.memory_regions = REGION_SMEM | REGION_STOLEN_LMEM,
        .__runtime.platform_engine_mask = BIT(RCS0) | BIT(BCS0) | BIT(CCS0),

diff --cc drivers/gpu/drm/i915/i915_reg.h
Simple merge

diff --cc drivers/gpu/drm/i915/intel_device_info.h
Simple merge

diff --cc drivers/gpu/drm/i915/intel_gvt_mmio_table.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_pm.c
index 19d4a88184d7a1b74c1a728afcfc3dead60f4e2a,f3f15c2d5bb718f867eec20a8ad77100eafe4ba0..ee34e278563603ddb08141aa87a59ed3550e1f05
--- 1/drivers/gpu/drm/i915/intel_pm.c
--- 2/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@@ -4109,11 -4105,9 +4101,9 @@@ static void g4x_disable_trickle_feed(st
        enum pipe pipe;
  
        for_each_pipe(dev_priv, pipe) {
-               intel_uncore_write(&dev_priv->uncore, DSPCNTR(pipe),
-                          intel_uncore_read(&dev_priv->uncore, DSPCNTR(pipe)) |
-                          DISP_TRICKLE_FEED_DISABLE);
+               intel_uncore_rmw(&dev_priv->uncore, DSPCNTR(pipe), 0, DISP_TRICKLE_FEED_DISABLE);
  
 -              intel_uncore_write(&dev_priv->uncore, DSPSURF(pipe), intel_uncore_read(&dev_priv->uncore, DSPSURF(pipe)));
 +              intel_uncore_rmw(&dev_priv->uncore, DSPSURF(pipe), 0, 0);
                intel_uncore_posting_read(&dev_priv->uncore, DSPSURF(pipe));
        }
  }

diff --cc drivers/gpu/drm/i915/intel_runtime_pm.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_uncore.h
Simple merge

diff --cc drivers/gpu/drm/i915/pxp/intel_pxp_session.c
Simple merge

diff --cc drivers/gpu/drm/i915/pxp/intel_pxp_tee.c
Simple merge