Merge tag 'topic/adl-s-enabling-2021-02-01-1' of git://anongit.freedesktop.org/drm...

Driver Changes:
  - Add basic support for Alder Lake S, to be shared between
  drm-intel-next and drm-intel-gt-next

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
# Conflicts:
#	drivers/gpu/drm/i915/i915_drv.h
From: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210202025620.2212559-1-lucas.demarchi@intel.com

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

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

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

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

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

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

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

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

diff --cc drivers/gpu/drm/i915/i915_drv.h
index 574f3575879df4a522b5ac98e806138b2f8f0c5c,548344ef1e8b8e23973078b53b5236142976c93e..2a4666f9d9d02b1ddf2d7e2288c73225ae408fa2
--- 1/drivers/gpu/drm/i915/i915_drv.h
--- 2/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@@ -1755,11 -1785,9 +1778,14 @@@ tgl_stepping_get(struct drm_i915_privat
  #define INTEL_DISPLAY_ENABLED(dev_priv) \
        (drm_WARN_ON(&(dev_priv)->drm, !HAS_DISPLAY(dev_priv)), !(dev_priv)->params.disable_display)
  
 +static inline bool run_as_guest(void)
 +{
 +      return !hypervisor_is_type(X86_HYPER_NATIVE);
 +}
 +
+ #define HAS_D12_PLANE_MINIMIZATION(dev_priv) (IS_ROCKETLAKE(dev_priv) || \
+                                             IS_ALDERLAKE_S(dev_priv))
+ 
  static inline bool intel_vtd_active(void)
  {
  #ifdef CONFIG_INTEL_IOMMU

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

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

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

diff --cc drivers/gpu/drm/i915/intel_pm.c
index 0c3e63f27c29d8f547bea447e18c1a9320e5b097,319acca2630b93764bd557e482c6537d2afba400..c58e5077590df9b499f45cd3035a6702ceac4d5a
--- 1/drivers/gpu/drm/i915/intel_pm.c
--- 2/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@@ -7065,14 -7103,14 +7065,14 @@@ static void icl_init_clock_gating(struc
                         0, CNL_DELAY_PMRSP);
  }
  
 -static void tgl_init_clock_gating(struct drm_i915_private *dev_priv)
 +static void gen12lp_init_clock_gating(struct drm_i915_private *dev_priv)
  {
 -      /* Wa_1409120013:tgl */
 +      /* Wa_1409120013:tgl,rkl,adl_s,dg1 */
        intel_uncore_write(&dev_priv->uncore, ILK_DPFC_CHICKEN,
 -                 ILK_DPFC_CHICKEN_COMP_DUMMY_PIXEL);
 +                         ILK_DPFC_CHICKEN_COMP_DUMMY_PIXEL);
  
        /* Wa_1409825376:tgl (pre-prod)*/
-       if (IS_TGL_DISP_REVID(dev_priv, TGL_REVID_A0, TGL_REVID_B1))
+       if (IS_TGL_DISP_STEPPING(dev_priv, STEP_A0, STEP_B1))
                intel_uncore_write(&dev_priv->uncore, GEN9_CLKGATE_DIS_3, intel_uncore_read(&dev_priv->uncore, GEN9_CLKGATE_DIS_3) |
                           TGL_VRH_GATING_DIS);