drm/i915: add new "soc" sub-directory and move PCH and DRAM code there
authorJani Nikula <jani.nikula@intel.com>
Thu, 8 Dec 2022 14:23:47 +0000 (16:23 +0200)
committerJani Nikula <jani.nikula@intel.com>
Tue, 13 Dec 2022 13:16:27 +0000 (15:16 +0200)
Add a new sub-directory for things that aren't specifically about the
GPU and don't really belong in the i915 driver top level, but also don't
belong under any of the existing sub-directories either.

Name it "soc", and move the PCH and DRAM code there.

Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221208142347.602726-1-jani.nikula@intel.com
drivers/gpu/drm/i915/Makefile
drivers/gpu/drm/i915/i915_driver.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_dram.c [deleted file]
drivers/gpu/drm/i915/intel_dram.h [deleted file]
drivers/gpu/drm/i915/intel_pch.c [deleted file]
drivers/gpu/drm/i915/intel_pch.h [deleted file]
drivers/gpu/drm/i915/soc/intel_dram.c [new file with mode: 0644]
drivers/gpu/drm/i915/soc/intel_dram.h [new file with mode: 0644]
drivers/gpu/drm/i915/soc/intel_pch.c [new file with mode: 0644]
drivers/gpu/drm/i915/soc/intel_pch.h [new file with mode: 0644]

index cb8232bd315bede3c6319a24514fb44dc60bd721..0ed5985c03b5bb8d17c92c40d975b459ff85d8e2 100644 (file)
@@ -48,9 +48,7 @@ i915-y += i915_driver.o \
          i915_sysfs.o \
          i915_utils.o \
          intel_device_info.o \
-         intel_dram.o \
          intel_memory_region.o \
-         intel_pch.o \
          intel_pcode.o \
          intel_pm.o \
          intel_region_ttm.o \
@@ -62,6 +60,11 @@ i915-y += i915_driver.o \
          vlv_sideband.o \
          vlv_suspend.o
 
+# core peripheral code
+i915-y += \
+       soc/intel_dram.o \
+       soc/intel_pch.o
+
 # core library code
 i915-y += \
        i915_memcpy.o \
index c3d43f9b1e45dbaefcb341a27436889ea44464bf..9ceea52ad9db6b2a418e4c97a8c4bcbfb0c184ff 100644 (file)
@@ -75,6 +75,8 @@
 
 #include "pxp/intel_pxp_pm.h"
 
+#include "soc/intel_dram.h"
+
 #include "i915_file_private.h"
 #include "i915_debugfs.h"
 #include "i915_driver.h"
@@ -93,7 +95,6 @@
 #include "i915_sysfs.h"
 #include "i915_utils.h"
 #include "i915_vgpu.h"
-#include "intel_dram.h"
 #include "intel_gvt.h"
 #include "intel_memory_region.h"
 #include "intel_pci_config.h"
index 5d2c54456cc1f422b61113b55e26f3363e9bfd39..05b84196216c43c90149e14729ff1c40fcebc5b6 100644 (file)
@@ -49,6 +49,8 @@
 #include "gt/intel_workarounds.h"
 #include "gt/uc/intel_uc.h"
 
+#include "soc/intel_pch.h"
+
 #include "i915_drm_client.h"
 #include "i915_gem.h"
 #include "i915_gpu_error.h"
@@ -58,7 +60,6 @@
 #include "i915_utils.h"
 #include "intel_device_info.h"
 #include "intel_memory_region.h"
-#include "intel_pch.h"
 #include "intel_runtime_pm.h"
 #include "intel_step.h"
 #include "intel_uncore.h"
diff --git a/drivers/gpu/drm/i915/intel_dram.c b/drivers/gpu/drm/i915/intel_dram.c
deleted file mode 100644 (file)
index bba8cb6..0000000
+++ /dev/null
@@ -1,572 +0,0 @@
-// SPDX-License-Identifier: MIT
-/*
- * Copyright © 2020 Intel Corporation
- */
-
-#include <linux/string_helpers.h>
-
-#include "i915_drv.h"
-#include "i915_reg.h"
-#include "intel_dram.h"
-#include "intel_mchbar_regs.h"
-#include "intel_pcode.h"
-
-struct dram_dimm_info {
-       u16 size;
-       u8 width, ranks;
-};
-
-struct dram_channel_info {
-       struct dram_dimm_info dimm_l, dimm_s;
-       u8 ranks;
-       bool is_16gb_dimm;
-};
-
-#define DRAM_TYPE_STR(type) [INTEL_DRAM_ ## type] = #type
-
-static const char *intel_dram_type_str(enum intel_dram_type type)
-{
-       static const char * const str[] = {
-               DRAM_TYPE_STR(UNKNOWN),
-               DRAM_TYPE_STR(DDR3),
-               DRAM_TYPE_STR(DDR4),
-               DRAM_TYPE_STR(LPDDR3),
-               DRAM_TYPE_STR(LPDDR4),
-       };
-
-       if (type >= ARRAY_SIZE(str))
-               type = INTEL_DRAM_UNKNOWN;
-
-       return str[type];
-}
-
-#undef DRAM_TYPE_STR
-
-static int intel_dimm_num_devices(const struct dram_dimm_info *dimm)
-{
-       return dimm->ranks * 64 / (dimm->width ?: 1);
-}
-
-/* Returns total Gb for the whole DIMM */
-static int skl_get_dimm_size(u16 val)
-{
-       return (val & SKL_DRAM_SIZE_MASK) * 8;
-}
-
-static int skl_get_dimm_width(u16 val)
-{
-       if (skl_get_dimm_size(val) == 0)
-               return 0;
-
-       switch (val & SKL_DRAM_WIDTH_MASK) {
-       case SKL_DRAM_WIDTH_X8:
-       case SKL_DRAM_WIDTH_X16:
-       case SKL_DRAM_WIDTH_X32:
-               val = (val & SKL_DRAM_WIDTH_MASK) >> SKL_DRAM_WIDTH_SHIFT;
-               return 8 << val;
-       default:
-               MISSING_CASE(val);
-               return 0;
-       }
-}
-
-static int skl_get_dimm_ranks(u16 val)
-{
-       if (skl_get_dimm_size(val) == 0)
-               return 0;
-
-       val = (val & SKL_DRAM_RANK_MASK) >> SKL_DRAM_RANK_SHIFT;
-
-       return val + 1;
-}
-
-/* Returns total Gb for the whole DIMM */
-static int icl_get_dimm_size(u16 val)
-{
-       return (val & ICL_DRAM_SIZE_MASK) * 8 / 2;
-}
-
-static int icl_get_dimm_width(u16 val)
-{
-       if (icl_get_dimm_size(val) == 0)
-               return 0;
-
-       switch (val & ICL_DRAM_WIDTH_MASK) {
-       case ICL_DRAM_WIDTH_X8:
-       case ICL_DRAM_WIDTH_X16:
-       case ICL_DRAM_WIDTH_X32:
-               val = (val & ICL_DRAM_WIDTH_MASK) >> ICL_DRAM_WIDTH_SHIFT;
-               return 8 << val;
-       default:
-               MISSING_CASE(val);
-               return 0;
-       }
-}
-
-static int icl_get_dimm_ranks(u16 val)
-{
-       if (icl_get_dimm_size(val) == 0)
-               return 0;
-
-       val = (val & ICL_DRAM_RANK_MASK) >> ICL_DRAM_RANK_SHIFT;
-
-       return val + 1;
-}
-
-static bool
-skl_is_16gb_dimm(const struct dram_dimm_info *dimm)
-{
-       /* Convert total Gb to Gb per DRAM device */
-       return dimm->size / (intel_dimm_num_devices(dimm) ?: 1) == 16;
-}
-
-static void
-skl_dram_get_dimm_info(struct drm_i915_private *i915,
-                      struct dram_dimm_info *dimm,
-                      int channel, char dimm_name, u16 val)
-{
-       if (GRAPHICS_VER(i915) >= 11) {
-               dimm->size = icl_get_dimm_size(val);
-               dimm->width = icl_get_dimm_width(val);
-               dimm->ranks = icl_get_dimm_ranks(val);
-       } else {
-               dimm->size = skl_get_dimm_size(val);
-               dimm->width = skl_get_dimm_width(val);
-               dimm->ranks = skl_get_dimm_ranks(val);
-       }
-
-       drm_dbg_kms(&i915->drm,
-                   "CH%u DIMM %c size: %u Gb, width: X%u, ranks: %u, 16Gb DIMMs: %s\n",
-                   channel, dimm_name, dimm->size, dimm->width, dimm->ranks,
-                   str_yes_no(skl_is_16gb_dimm(dimm)));
-}
-
-static int
-skl_dram_get_channel_info(struct drm_i915_private *i915,
-                         struct dram_channel_info *ch,
-                         int channel, u32 val)
-{
-       skl_dram_get_dimm_info(i915, &ch->dimm_l,
-                              channel, 'L', val & 0xffff);
-       skl_dram_get_dimm_info(i915, &ch->dimm_s,
-                              channel, 'S', val >> 16);
-
-       if (ch->dimm_l.size == 0 && ch->dimm_s.size == 0) {
-               drm_dbg_kms(&i915->drm, "CH%u not populated\n", channel);
-               return -EINVAL;
-       }
-
-       if (ch->dimm_l.ranks == 2 || ch->dimm_s.ranks == 2)
-               ch->ranks = 2;
-       else if (ch->dimm_l.ranks == 1 && ch->dimm_s.ranks == 1)
-               ch->ranks = 2;
-       else
-               ch->ranks = 1;
-
-       ch->is_16gb_dimm = skl_is_16gb_dimm(&ch->dimm_l) ||
-               skl_is_16gb_dimm(&ch->dimm_s);
-
-       drm_dbg_kms(&i915->drm, "CH%u ranks: %u, 16Gb DIMMs: %s\n",
-                   channel, ch->ranks, str_yes_no(ch->is_16gb_dimm));
-
-       return 0;
-}
-
-static bool
-intel_is_dram_symmetric(const struct dram_channel_info *ch0,
-                       const struct dram_channel_info *ch1)
-{
-       return !memcmp(ch0, ch1, sizeof(*ch0)) &&
-               (ch0->dimm_s.size == 0 ||
-                !memcmp(&ch0->dimm_l, &ch0->dimm_s, sizeof(ch0->dimm_l)));
-}
-
-static int
-skl_dram_get_channels_info(struct drm_i915_private *i915)
-{
-       struct dram_info *dram_info = &i915->dram_info;
-       struct dram_channel_info ch0 = {}, ch1 = {};
-       u32 val;
-       int ret;
-
-       val = intel_uncore_read(&i915->uncore,
-                               SKL_MAD_DIMM_CH0_0_0_0_MCHBAR_MCMAIN);
-       ret = skl_dram_get_channel_info(i915, &ch0, 0, val);
-       if (ret == 0)
-               dram_info->num_channels++;
-
-       val = intel_uncore_read(&i915->uncore,
-                               SKL_MAD_DIMM_CH1_0_0_0_MCHBAR_MCMAIN);
-       ret = skl_dram_get_channel_info(i915, &ch1, 1, val);
-       if (ret == 0)
-               dram_info->num_channels++;
-
-       if (dram_info->num_channels == 0) {
-               drm_info(&i915->drm, "Number of memory channels is zero\n");
-               return -EINVAL;
-       }
-
-       if (ch0.ranks == 0 && ch1.ranks == 0) {
-               drm_info(&i915->drm, "couldn't get memory rank information\n");
-               return -EINVAL;
-       }
-
-       dram_info->wm_lv_0_adjust_needed = ch0.is_16gb_dimm || ch1.is_16gb_dimm;
-
-       dram_info->symmetric_memory = intel_is_dram_symmetric(&ch0, &ch1);
-
-       drm_dbg_kms(&i915->drm, "Memory configuration is symmetric? %s\n",
-                   str_yes_no(dram_info->symmetric_memory));
-
-       return 0;
-}
-
-static enum intel_dram_type
-skl_get_dram_type(struct drm_i915_private *i915)
-{
-       u32 val;
-
-       val = intel_uncore_read(&i915->uncore,
-                               SKL_MAD_INTER_CHANNEL_0_0_0_MCHBAR_MCMAIN);
-
-       switch (val & SKL_DRAM_DDR_TYPE_MASK) {
-       case SKL_DRAM_DDR_TYPE_DDR3:
-               return INTEL_DRAM_DDR3;
-       case SKL_DRAM_DDR_TYPE_DDR4:
-               return INTEL_DRAM_DDR4;
-       case SKL_DRAM_DDR_TYPE_LPDDR3:
-               return INTEL_DRAM_LPDDR3;
-       case SKL_DRAM_DDR_TYPE_LPDDR4:
-               return INTEL_DRAM_LPDDR4;
-       default:
-               MISSING_CASE(val);
-               return INTEL_DRAM_UNKNOWN;
-       }
-}
-
-static int
-skl_get_dram_info(struct drm_i915_private *i915)
-{
-       struct dram_info *dram_info = &i915->dram_info;
-       int ret;
-
-       dram_info->type = skl_get_dram_type(i915);
-       drm_dbg_kms(&i915->drm, "DRAM type: %s\n",
-                   intel_dram_type_str(dram_info->type));
-
-       ret = skl_dram_get_channels_info(i915);
-       if (ret)
-               return ret;
-
-       return 0;
-}
-
-/* Returns Gb per DRAM device */
-static int bxt_get_dimm_size(u32 val)
-{
-       switch (val & BXT_DRAM_SIZE_MASK) {
-       case BXT_DRAM_SIZE_4GBIT:
-               return 4;
-       case BXT_DRAM_SIZE_6GBIT:
-               return 6;
-       case BXT_DRAM_SIZE_8GBIT:
-               return 8;
-       case BXT_DRAM_SIZE_12GBIT:
-               return 12;
-       case BXT_DRAM_SIZE_16GBIT:
-               return 16;
-       default:
-               MISSING_CASE(val);
-               return 0;
-       }
-}
-
-static int bxt_get_dimm_width(u32 val)
-{
-       if (!bxt_get_dimm_size(val))
-               return 0;
-
-       val = (val & BXT_DRAM_WIDTH_MASK) >> BXT_DRAM_WIDTH_SHIFT;
-
-       return 8 << val;
-}
-
-static int bxt_get_dimm_ranks(u32 val)
-{
-       if (!bxt_get_dimm_size(val))
-               return 0;
-
-       switch (val & BXT_DRAM_RANK_MASK) {
-       case BXT_DRAM_RANK_SINGLE:
-               return 1;
-       case BXT_DRAM_RANK_DUAL:
-               return 2;
-       default:
-               MISSING_CASE(val);
-               return 0;
-       }
-}
-
-static enum intel_dram_type bxt_get_dimm_type(u32 val)
-{
-       if (!bxt_get_dimm_size(val))
-               return INTEL_DRAM_UNKNOWN;
-
-       switch (val & BXT_DRAM_TYPE_MASK) {
-       case BXT_DRAM_TYPE_DDR3:
-               return INTEL_DRAM_DDR3;
-       case BXT_DRAM_TYPE_LPDDR3:
-               return INTEL_DRAM_LPDDR3;
-       case BXT_DRAM_TYPE_DDR4:
-               return INTEL_DRAM_DDR4;
-       case BXT_DRAM_TYPE_LPDDR4:
-               return INTEL_DRAM_LPDDR4;
-       default:
-               MISSING_CASE(val);
-               return INTEL_DRAM_UNKNOWN;
-       }
-}
-
-static void bxt_get_dimm_info(struct dram_dimm_info *dimm, u32 val)
-{
-       dimm->width = bxt_get_dimm_width(val);
-       dimm->ranks = bxt_get_dimm_ranks(val);
-
-       /*
-        * Size in register is Gb per DRAM device. Convert to total
-        * Gb to match the way we report this for non-LP platforms.
-        */
-       dimm->size = bxt_get_dimm_size(val) * intel_dimm_num_devices(dimm);
-}
-
-static int bxt_get_dram_info(struct drm_i915_private *i915)
-{
-       struct dram_info *dram_info = &i915->dram_info;
-       u32 val;
-       u8 valid_ranks = 0;
-       int i;
-
-       /*
-        * Now read each DUNIT8/9/10/11 to check the rank of each dimms.
-        */
-       for (i = BXT_D_CR_DRP0_DUNIT_START; i <= BXT_D_CR_DRP0_DUNIT_END; i++) {
-               struct dram_dimm_info dimm;
-               enum intel_dram_type type;
-
-               val = intel_uncore_read(&i915->uncore, BXT_D_CR_DRP0_DUNIT(i));
-               if (val == 0xFFFFFFFF)
-                       continue;
-
-               dram_info->num_channels++;
-
-               bxt_get_dimm_info(&dimm, val);
-               type = bxt_get_dimm_type(val);
-
-               drm_WARN_ON(&i915->drm, type != INTEL_DRAM_UNKNOWN &&
-                           dram_info->type != INTEL_DRAM_UNKNOWN &&
-                           dram_info->type != type);
-
-               drm_dbg_kms(&i915->drm,
-                           "CH%u DIMM size: %u Gb, width: X%u, ranks: %u, type: %s\n",
-                           i - BXT_D_CR_DRP0_DUNIT_START,
-                           dimm.size, dimm.width, dimm.ranks,
-                           intel_dram_type_str(type));
-
-               if (valid_ranks == 0)
-                       valid_ranks = dimm.ranks;
-
-               if (type != INTEL_DRAM_UNKNOWN)
-                       dram_info->type = type;
-       }
-
-       if (dram_info->type == INTEL_DRAM_UNKNOWN || valid_ranks == 0) {
-               drm_info(&i915->drm, "couldn't get memory information\n");
-               return -EINVAL;
-       }
-
-       return 0;
-}
-
-static int icl_pcode_read_mem_global_info(struct drm_i915_private *dev_priv)
-{
-       struct dram_info *dram_info = &dev_priv->dram_info;
-       u32 val = 0;
-       int ret;
-
-       ret = snb_pcode_read(&dev_priv->uncore, ICL_PCODE_MEM_SUBSYSYSTEM_INFO |
-                            ICL_PCODE_MEM_SS_READ_GLOBAL_INFO, &val, NULL);
-       if (ret)
-               return ret;
-
-       if (GRAPHICS_VER(dev_priv) == 12) {
-               switch (val & 0xf) {
-               case 0:
-                       dram_info->type = INTEL_DRAM_DDR4;
-                       break;
-               case 1:
-                       dram_info->type = INTEL_DRAM_DDR5;
-                       break;
-               case 2:
-                       dram_info->type = INTEL_DRAM_LPDDR5;
-                       break;
-               case 3:
-                       dram_info->type = INTEL_DRAM_LPDDR4;
-                       break;
-               case 4:
-                       dram_info->type = INTEL_DRAM_DDR3;
-                       break;
-               case 5:
-                       dram_info->type = INTEL_DRAM_LPDDR3;
-                       break;
-               default:
-                       MISSING_CASE(val & 0xf);
-                       return -EINVAL;
-               }
-       } else {
-               switch (val & 0xf) {
-               case 0:
-                       dram_info->type = INTEL_DRAM_DDR4;
-                       break;
-               case 1:
-                       dram_info->type = INTEL_DRAM_DDR3;
-                       break;
-               case 2:
-                       dram_info->type = INTEL_DRAM_LPDDR3;
-                       break;
-               case 3:
-                       dram_info->type = INTEL_DRAM_LPDDR4;
-                       break;
-               default:
-                       MISSING_CASE(val & 0xf);
-                       return -EINVAL;
-               }
-       }
-
-       dram_info->num_channels = (val & 0xf0) >> 4;
-       dram_info->num_qgv_points = (val & 0xf00) >> 8;
-       dram_info->num_psf_gv_points = (val & 0x3000) >> 12;
-
-       return 0;
-}
-
-static int gen11_get_dram_info(struct drm_i915_private *i915)
-{
-       int ret = skl_get_dram_info(i915);
-
-       if (ret)
-               return ret;
-
-       return icl_pcode_read_mem_global_info(i915);
-}
-
-static int gen12_get_dram_info(struct drm_i915_private *i915)
-{
-       i915->dram_info.wm_lv_0_adjust_needed = false;
-
-       return icl_pcode_read_mem_global_info(i915);
-}
-
-static int xelpdp_get_dram_info(struct drm_i915_private *i915)
-{
-       u32 val = intel_uncore_read(&i915->uncore, MTL_MEM_SS_INFO_GLOBAL);
-       struct dram_info *dram_info = &i915->dram_info;
-
-       switch (REG_FIELD_GET(MTL_DDR_TYPE_MASK, val)) {
-       case 0:
-               dram_info->type = INTEL_DRAM_DDR4;
-               break;
-       case 1:
-               dram_info->type = INTEL_DRAM_DDR5;
-               break;
-       case 2:
-               dram_info->type = INTEL_DRAM_LPDDR5;
-               break;
-       case 3:
-               dram_info->type = INTEL_DRAM_LPDDR4;
-               break;
-       case 4:
-               dram_info->type = INTEL_DRAM_DDR3;
-               break;
-       case 5:
-               dram_info->type = INTEL_DRAM_LPDDR3;
-               break;
-       default:
-               MISSING_CASE(val);
-               return -EINVAL;
-       }
-
-       dram_info->num_channels = REG_FIELD_GET(MTL_N_OF_POPULATED_CH_MASK, val);
-       dram_info->num_qgv_points = REG_FIELD_GET(MTL_N_OF_ENABLED_QGV_POINTS_MASK, val);
-       /* PSF GV points not supported in D14+ */
-
-       return 0;
-}
-
-void intel_dram_detect(struct drm_i915_private *i915)
-{
-       struct dram_info *dram_info = &i915->dram_info;
-       int ret;
-
-       if (GRAPHICS_VER(i915) < 9 || IS_DG2(i915) || !HAS_DISPLAY(i915))
-               return;
-
-       /*
-        * Assume level 0 watermark latency adjustment is needed until proven
-        * otherwise, this w/a is not needed by bxt/glk.
-        */
-       dram_info->wm_lv_0_adjust_needed = !IS_GEN9_LP(i915);
-
-       if (DISPLAY_VER(i915) >= 14)
-               ret = xelpdp_get_dram_info(i915);
-       else if (GRAPHICS_VER(i915) >= 12)
-               ret = gen12_get_dram_info(i915);
-       else if (GRAPHICS_VER(i915) >= 11)
-               ret = gen11_get_dram_info(i915);
-       else if (IS_GEN9_LP(i915))
-               ret = bxt_get_dram_info(i915);
-       else
-               ret = skl_get_dram_info(i915);
-       if (ret)
-               return;
-
-       drm_dbg_kms(&i915->drm, "DRAM channels: %u\n", dram_info->num_channels);
-
-       drm_dbg_kms(&i915->drm, "Watermark level 0 adjustment needed: %s\n",
-                   str_yes_no(dram_info->wm_lv_0_adjust_needed));
-}
-
-static u32 gen9_edram_size_mb(struct drm_i915_private *i915, u32 cap)
-{
-       static const u8 ways[8] = { 4, 8, 12, 16, 16, 16, 16, 16 };
-       static const u8 sets[4] = { 1, 1, 2, 2 };
-
-       return EDRAM_NUM_BANKS(cap) *
-               ways[EDRAM_WAYS_IDX(cap)] *
-               sets[EDRAM_SETS_IDX(cap)];
-}
-
-void intel_dram_edram_detect(struct drm_i915_private *i915)
-{
-       u32 edram_cap = 0;
-
-       if (!(IS_HASWELL(i915) || IS_BROADWELL(i915) || GRAPHICS_VER(i915) >= 9))
-               return;
-
-       edram_cap = __raw_uncore_read32(&i915->uncore, HSW_EDRAM_CAP);
-
-       /* NB: We can't write IDICR yet because we don't have gt funcs set up */
-
-       if (!(edram_cap & EDRAM_ENABLED))
-               return;
-
-       /*
-        * The needed capability bits for size calculation are not there with
-        * pre gen9 so return 128MB always.
-        */
-       if (GRAPHICS_VER(i915) < 9)
-               i915->edram_size_mb = 128;
-       else
-               i915->edram_size_mb = gen9_edram_size_mb(i915, edram_cap);
-
-       drm_info(&i915->drm, "Found %uMB of eDRAM\n", i915->edram_size_mb);
-}
diff --git a/drivers/gpu/drm/i915/intel_dram.h b/drivers/gpu/drm/i915/intel_dram.h
deleted file mode 100644 (file)
index 4ba13c1..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: MIT */
-/*
- * Copyright © 2020 Intel Corporation
- */
-
-#ifndef __INTEL_DRAM_H__
-#define __INTEL_DRAM_H__
-
-struct drm_i915_private;
-
-void intel_dram_edram_detect(struct drm_i915_private *i915);
-void intel_dram_detect(struct drm_i915_private *i915);
-
-#endif /* __INTEL_DRAM_H__ */
diff --git a/drivers/gpu/drm/i915/intel_pch.c b/drivers/gpu/drm/i915/intel_pch.c
deleted file mode 100644 (file)
index ba9843c..0000000
+++ /dev/null
@@ -1,279 +0,0 @@
-// SPDX-License-Identifier: MIT
-/*
- * Copyright 2019 Intel Corporation.
- */
-
-#include "i915_drv.h"
-#include "i915_utils.h"
-#include "intel_pch.h"
-
-/* Map PCH device id to PCH type, or PCH_NONE if unknown. */
-static enum intel_pch
-intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)
-{
-       switch (id) {
-       case INTEL_PCH_IBX_DEVICE_ID_TYPE:
-               drm_dbg_kms(&dev_priv->drm, "Found Ibex Peak PCH\n");
-               drm_WARN_ON(&dev_priv->drm, GRAPHICS_VER(dev_priv) != 5);
-               return PCH_IBX;
-       case INTEL_PCH_CPT_DEVICE_ID_TYPE:
-               drm_dbg_kms(&dev_priv->drm, "Found CougarPoint PCH\n");
-               drm_WARN_ON(&dev_priv->drm,
-                           GRAPHICS_VER(dev_priv) != 6 && !IS_IVYBRIDGE(dev_priv));
-               return PCH_CPT;
-       case INTEL_PCH_PPT_DEVICE_ID_TYPE:
-               drm_dbg_kms(&dev_priv->drm, "Found PantherPoint PCH\n");
-               drm_WARN_ON(&dev_priv->drm,
-                           GRAPHICS_VER(dev_priv) != 6 && !IS_IVYBRIDGE(dev_priv));
-               /* PPT is CPT compatible */
-               return PCH_CPT;
-       case INTEL_PCH_LPT_DEVICE_ID_TYPE:
-               drm_dbg_kms(&dev_priv->drm, "Found LynxPoint PCH\n");
-               drm_WARN_ON(&dev_priv->drm,
-                           !IS_HASWELL(dev_priv) && !IS_BROADWELL(dev_priv));
-               drm_WARN_ON(&dev_priv->drm,
-                           IS_HSW_ULT(dev_priv) || IS_BDW_ULT(dev_priv));
-               return PCH_LPT;
-       case INTEL_PCH_LPT_LP_DEVICE_ID_TYPE:
-               drm_dbg_kms(&dev_priv->drm, "Found LynxPoint LP PCH\n");
-               drm_WARN_ON(&dev_priv->drm,
-                           !IS_HASWELL(dev_priv) && !IS_BROADWELL(dev_priv));
-               drm_WARN_ON(&dev_priv->drm,
-                           !IS_HSW_ULT(dev_priv) && !IS_BDW_ULT(dev_priv));
-               return PCH_LPT;
-       case INTEL_PCH_WPT_DEVICE_ID_TYPE:
-               drm_dbg_kms(&dev_priv->drm, "Found WildcatPoint PCH\n");
-               drm_WARN_ON(&dev_priv->drm,
-                           !IS_HASWELL(dev_priv) && !IS_BROADWELL(dev_priv));
-               drm_WARN_ON(&dev_priv->drm,
-                           IS_HSW_ULT(dev_priv) || IS_BDW_ULT(dev_priv));
-               /* WPT is LPT compatible */
-               return PCH_LPT;
-       case INTEL_PCH_WPT_LP_DEVICE_ID_TYPE:
-               drm_dbg_kms(&dev_priv->drm, "Found WildcatPoint LP PCH\n");
-               drm_WARN_ON(&dev_priv->drm,
-                           !IS_HASWELL(dev_priv) && !IS_BROADWELL(dev_priv));
-               drm_WARN_ON(&dev_priv->drm,
-                           !IS_HSW_ULT(dev_priv) && !IS_BDW_ULT(dev_priv));
-               /* WPT is LPT compatible */
-               return PCH_LPT;
-       case INTEL_PCH_SPT_DEVICE_ID_TYPE:
-               drm_dbg_kms(&dev_priv->drm, "Found SunrisePoint PCH\n");
-               drm_WARN_ON(&dev_priv->drm,
-                           !IS_SKYLAKE(dev_priv) && !IS_KABYLAKE(dev_priv));
-               return PCH_SPT;
-       case INTEL_PCH_SPT_LP_DEVICE_ID_TYPE:
-               drm_dbg_kms(&dev_priv->drm, "Found SunrisePoint LP PCH\n");
-               drm_WARN_ON(&dev_priv->drm,
-                           !IS_SKYLAKE(dev_priv) &&
-                           !IS_KABYLAKE(dev_priv) &&
-                           !IS_COFFEELAKE(dev_priv) &&
-                           !IS_COMETLAKE(dev_priv));
-               return PCH_SPT;
-       case INTEL_PCH_KBP_DEVICE_ID_TYPE:
-               drm_dbg_kms(&dev_priv->drm, "Found Kaby Lake PCH (KBP)\n");
-               drm_WARN_ON(&dev_priv->drm,
-                           !IS_SKYLAKE(dev_priv) &&
-                           !IS_KABYLAKE(dev_priv) &&
-                           !IS_COFFEELAKE(dev_priv) &&
-                           !IS_COMETLAKE(dev_priv));
-               /* KBP is SPT compatible */
-               return PCH_SPT;
-       case INTEL_PCH_CNP_DEVICE_ID_TYPE:
-               drm_dbg_kms(&dev_priv->drm, "Found Cannon Lake PCH (CNP)\n");
-               drm_WARN_ON(&dev_priv->drm,
-                           !IS_COFFEELAKE(dev_priv) &&
-                           !IS_COMETLAKE(dev_priv));
-               return PCH_CNP;
-       case INTEL_PCH_CNP_LP_DEVICE_ID_TYPE:
-               drm_dbg_kms(&dev_priv->drm,
-                           "Found Cannon Lake LP PCH (CNP-LP)\n");
-               drm_WARN_ON(&dev_priv->drm,
-                           !IS_COFFEELAKE(dev_priv) &&
-                           !IS_COMETLAKE(dev_priv));
-               return PCH_CNP;
-       case INTEL_PCH_CMP_DEVICE_ID_TYPE:
-       case INTEL_PCH_CMP2_DEVICE_ID_TYPE:
-               drm_dbg_kms(&dev_priv->drm, "Found Comet Lake PCH (CMP)\n");
-               drm_WARN_ON(&dev_priv->drm,
-                           !IS_COFFEELAKE(dev_priv) &&
-                           !IS_COMETLAKE(dev_priv) &&
-                           !IS_ROCKETLAKE(dev_priv));
-               /* CMP is CNP compatible */
-               return PCH_CNP;
-       case INTEL_PCH_CMP_V_DEVICE_ID_TYPE:
-               drm_dbg_kms(&dev_priv->drm, "Found Comet Lake V PCH (CMP-V)\n");
-               drm_WARN_ON(&dev_priv->drm,
-                           !IS_COFFEELAKE(dev_priv) &&
-                           !IS_COMETLAKE(dev_priv));
-               /* CMP-V is based on KBP, which is SPT compatible */
-               return PCH_SPT;
-       case INTEL_PCH_ICP_DEVICE_ID_TYPE:
-       case INTEL_PCH_ICP2_DEVICE_ID_TYPE:
-               drm_dbg_kms(&dev_priv->drm, "Found Ice Lake PCH\n");
-               drm_WARN_ON(&dev_priv->drm, !IS_ICELAKE(dev_priv));
-               return PCH_ICP;
-       case INTEL_PCH_MCC_DEVICE_ID_TYPE:
-               drm_dbg_kms(&dev_priv->drm, "Found Mule Creek Canyon PCH\n");
-               drm_WARN_ON(&dev_priv->drm, !IS_JSL_EHL(dev_priv));
-               /* MCC is TGP compatible */
-               return PCH_TGP;
-       case INTEL_PCH_TGP_DEVICE_ID_TYPE:
-       case INTEL_PCH_TGP2_DEVICE_ID_TYPE:
-               drm_dbg_kms(&dev_priv->drm, "Found Tiger Lake LP PCH\n");
-               drm_WARN_ON(&dev_priv->drm, !IS_TIGERLAKE(dev_priv) &&
-                           !IS_ROCKETLAKE(dev_priv) &&
-                           !IS_GEN9_BC(dev_priv));
-               return PCH_TGP;
-       case INTEL_PCH_JSP_DEVICE_ID_TYPE:
-               drm_dbg_kms(&dev_priv->drm, "Found Jasper Lake PCH\n");
-               drm_WARN_ON(&dev_priv->drm, !IS_JSL_EHL(dev_priv));
-               /* JSP is ICP compatible */
-               return PCH_ICP;
-       case INTEL_PCH_ADP_DEVICE_ID_TYPE:
-       case INTEL_PCH_ADP2_DEVICE_ID_TYPE:
-       case INTEL_PCH_ADP3_DEVICE_ID_TYPE:
-       case INTEL_PCH_ADP4_DEVICE_ID_TYPE:
-               drm_dbg_kms(&dev_priv->drm, "Found Alder Lake PCH\n");
-               drm_WARN_ON(&dev_priv->drm, !IS_ALDERLAKE_S(dev_priv) &&
-                           !IS_ALDERLAKE_P(dev_priv));
-               return PCH_ADP;
-       case INTEL_PCH_MTP_DEVICE_ID_TYPE:
-       case INTEL_PCH_MTP2_DEVICE_ID_TYPE:
-               drm_dbg_kms(&dev_priv->drm, "Found Meteor Lake PCH\n");
-               drm_WARN_ON(&dev_priv->drm, !IS_METEORLAKE(dev_priv));
-               return PCH_MTP;
-       default:
-               return PCH_NONE;
-       }
-}
-
-static bool intel_is_virt_pch(unsigned short id,
-                             unsigned short svendor, unsigned short sdevice)
-{
-       return (id == INTEL_PCH_P2X_DEVICE_ID_TYPE ||
-               id == INTEL_PCH_P3X_DEVICE_ID_TYPE ||
-               (id == INTEL_PCH_QEMU_DEVICE_ID_TYPE &&
-                svendor == PCI_SUBVENDOR_ID_REDHAT_QUMRANET &&
-                sdevice == PCI_SUBDEVICE_ID_QEMU));
-}
-
-static void
-intel_virt_detect_pch(const struct drm_i915_private *dev_priv,
-                     unsigned short *pch_id, enum intel_pch *pch_type)
-{
-       unsigned short id = 0;
-
-       /*
-        * In a virtualized passthrough environment we can be in a
-        * setup where the ISA bridge is not able to be passed through.
-        * In this case, a south bridge can be emulated and we have to
-        * make an educated guess as to which PCH is really there.
-        */
-
-       if (IS_METEORLAKE(dev_priv))
-               id = INTEL_PCH_MTP_DEVICE_ID_TYPE;
-       else if (IS_ALDERLAKE_S(dev_priv) || IS_ALDERLAKE_P(dev_priv))
-               id = INTEL_PCH_ADP_DEVICE_ID_TYPE;
-       else if (IS_TIGERLAKE(dev_priv) || IS_ROCKETLAKE(dev_priv))
-               id = INTEL_PCH_TGP_DEVICE_ID_TYPE;
-       else if (IS_JSL_EHL(dev_priv))
-               id = INTEL_PCH_MCC_DEVICE_ID_TYPE;
-       else if (IS_ICELAKE(dev_priv))
-               id = INTEL_PCH_ICP_DEVICE_ID_TYPE;
-       else if (IS_COFFEELAKE(dev_priv) ||
-                IS_COMETLAKE(dev_priv))
-               id = INTEL_PCH_CNP_DEVICE_ID_TYPE;
-       else if (IS_KABYLAKE(dev_priv) || IS_SKYLAKE(dev_priv))
-               id = INTEL_PCH_SPT_DEVICE_ID_TYPE;
-       else if (IS_HSW_ULT(dev_priv) || IS_BDW_ULT(dev_priv))
-               id = INTEL_PCH_LPT_LP_DEVICE_ID_TYPE;
-       else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
-               id = INTEL_PCH_LPT_DEVICE_ID_TYPE;
-       else if (GRAPHICS_VER(dev_priv) == 6 || IS_IVYBRIDGE(dev_priv))
-               id = INTEL_PCH_CPT_DEVICE_ID_TYPE;
-       else if (GRAPHICS_VER(dev_priv) == 5)
-               id = INTEL_PCH_IBX_DEVICE_ID_TYPE;
-
-       if (id)
-               drm_dbg_kms(&dev_priv->drm, "Assuming PCH ID %04x\n", id);
-       else
-               drm_dbg_kms(&dev_priv->drm, "Assuming no PCH\n");
-
-       *pch_type = intel_pch_type(dev_priv, id);
-
-       /* Sanity check virtual PCH id */
-       if (drm_WARN_ON(&dev_priv->drm,
-                       id && *pch_type == PCH_NONE))
-               id = 0;
-
-       *pch_id = id;
-}
-
-void intel_detect_pch(struct drm_i915_private *dev_priv)
-{
-       struct pci_dev *pch = NULL;
-       unsigned short id;
-       enum intel_pch pch_type;
-
-       /* DG1 has south engine display on the same PCI device */
-       if (IS_DG1(dev_priv)) {
-               dev_priv->pch_type = PCH_DG1;
-               return;
-       } else if (IS_DG2(dev_priv)) {
-               dev_priv->pch_type = PCH_DG2;
-               return;
-       }
-
-       /*
-        * The reason to probe ISA bridge instead of Dev31:Fun0 is to
-        * make graphics device passthrough work easy for VMM, that only
-        * need to expose ISA bridge to let driver know the real hardware
-        * underneath. This is a requirement from virtualization team.
-        *
-        * In some virtualized environments (e.g. XEN), there is irrelevant
-        * ISA bridge in the system. To work reliably, we should scan trhough
-        * all the ISA bridge devices and check for the first match, instead
-        * of only checking the first one.
-        */
-       while ((pch = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, pch))) {
-               if (pch->vendor != PCI_VENDOR_ID_INTEL)
-                       continue;
-
-               id = pch->device & INTEL_PCH_DEVICE_ID_MASK;
-
-               pch_type = intel_pch_type(dev_priv, id);
-               if (pch_type != PCH_NONE) {
-                       dev_priv->pch_type = pch_type;
-                       dev_priv->pch_id = id;
-                       break;
-               } else if (intel_is_virt_pch(id, pch->subsystem_vendor,
-                                            pch->subsystem_device)) {
-                       intel_virt_detect_pch(dev_priv, &id, &pch_type);
-                       dev_priv->pch_type = pch_type;
-                       dev_priv->pch_id = id;
-                       break;
-               }
-       }
-
-       /*
-        * Use PCH_NOP (PCH but no South Display) for PCH platforms without
-        * display.
-        */
-       if (pch && !HAS_DISPLAY(dev_priv)) {
-               drm_dbg_kms(&dev_priv->drm,
-                           "Display disabled, reverting to NOP PCH\n");
-               dev_priv->pch_type = PCH_NOP;
-               dev_priv->pch_id = 0;
-       } else if (!pch) {
-               if (i915_run_as_guest() && HAS_DISPLAY(dev_priv)) {
-                       intel_virt_detect_pch(dev_priv, &id, &pch_type);
-                       dev_priv->pch_type = pch_type;
-                       dev_priv->pch_id = id;
-               } else {
-                       drm_dbg_kms(&dev_priv->drm, "No PCH found.\n");
-               }
-       }
-
-       pci_dev_put(pch);
-}
diff --git a/drivers/gpu/drm/i915/intel_pch.h b/drivers/gpu/drm/i915/intel_pch.h
deleted file mode 100644 (file)
index 32aff5a..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-/* SPDX-License-Identifier: MIT */
-/*
- * Copyright 2019 Intel Corporation.
- */
-
-#ifndef __INTEL_PCH__
-#define __INTEL_PCH__
-
-struct drm_i915_private;
-
-/*
- * Sorted by south display engine compatibility.
- * If the new PCH comes with a south display engine that is not
- * inherited from the latest item, please do not add it to the
- * end. Instead, add it right after its "parent" PCH.
- */
-enum intel_pch {
-       PCH_NOP = -1,   /* PCH without south display */
-       PCH_NONE = 0,   /* No PCH present */
-       PCH_IBX,        /* Ibexpeak PCH */
-       PCH_CPT,        /* Cougarpoint/Pantherpoint PCH */
-       PCH_LPT,        /* Lynxpoint/Wildcatpoint PCH */
-       PCH_SPT,        /* Sunrisepoint/Kaby Lake PCH */
-       PCH_CNP,        /* Cannon/Comet Lake PCH */
-       PCH_ICP,        /* Ice Lake/Jasper Lake PCH */
-       PCH_TGP,        /* Tiger Lake/Mule Creek Canyon PCH */
-       PCH_ADP,        /* Alder Lake PCH */
-       PCH_MTP,        /* Meteor Lake PCH */
-
-       /* Fake PCHs, functionality handled on the same PCI dev */
-       PCH_DG1 = 1024,
-       PCH_DG2,
-};
-
-#define INTEL_PCH_DEVICE_ID_MASK               0xff80
-#define INTEL_PCH_IBX_DEVICE_ID_TYPE           0x3b00
-#define INTEL_PCH_CPT_DEVICE_ID_TYPE           0x1c00
-#define INTEL_PCH_PPT_DEVICE_ID_TYPE           0x1e00
-#define INTEL_PCH_LPT_DEVICE_ID_TYPE           0x8c00
-#define INTEL_PCH_LPT_LP_DEVICE_ID_TYPE                0x9c00
-#define INTEL_PCH_WPT_DEVICE_ID_TYPE           0x8c80
-#define INTEL_PCH_WPT_LP_DEVICE_ID_TYPE                0x9c80
-#define INTEL_PCH_SPT_DEVICE_ID_TYPE           0xA100
-#define INTEL_PCH_SPT_LP_DEVICE_ID_TYPE                0x9D00
-#define INTEL_PCH_KBP_DEVICE_ID_TYPE           0xA280
-#define INTEL_PCH_CNP_DEVICE_ID_TYPE           0xA300
-#define INTEL_PCH_CNP_LP_DEVICE_ID_TYPE                0x9D80
-#define INTEL_PCH_CMP_DEVICE_ID_TYPE           0x0280
-#define INTEL_PCH_CMP2_DEVICE_ID_TYPE          0x0680
-#define INTEL_PCH_CMP_V_DEVICE_ID_TYPE         0xA380
-#define INTEL_PCH_ICP_DEVICE_ID_TYPE           0x3480
-#define INTEL_PCH_ICP2_DEVICE_ID_TYPE          0x3880
-#define INTEL_PCH_MCC_DEVICE_ID_TYPE           0x4B00
-#define INTEL_PCH_TGP_DEVICE_ID_TYPE           0xA080
-#define INTEL_PCH_TGP2_DEVICE_ID_TYPE          0x4380
-#define INTEL_PCH_JSP_DEVICE_ID_TYPE           0x4D80
-#define INTEL_PCH_ADP_DEVICE_ID_TYPE           0x7A80
-#define INTEL_PCH_ADP2_DEVICE_ID_TYPE          0x5180
-#define INTEL_PCH_ADP3_DEVICE_ID_TYPE          0x7A00
-#define INTEL_PCH_ADP4_DEVICE_ID_TYPE          0x5480
-#define INTEL_PCH_MTP_DEVICE_ID_TYPE           0x7E00
-#define INTEL_PCH_MTP2_DEVICE_ID_TYPE          0xAE00
-#define INTEL_PCH_P2X_DEVICE_ID_TYPE           0x7100
-#define INTEL_PCH_P3X_DEVICE_ID_TYPE           0x7000
-#define INTEL_PCH_QEMU_DEVICE_ID_TYPE          0x2900 /* qemu q35 has 2918 */
-
-#define INTEL_PCH_TYPE(dev_priv)               ((dev_priv)->pch_type)
-#define INTEL_PCH_ID(dev_priv)                 ((dev_priv)->pch_id)
-#define HAS_PCH_MTP(dev_priv)                  (INTEL_PCH_TYPE(dev_priv) == PCH_MTP)
-#define HAS_PCH_DG2(dev_priv)                  (INTEL_PCH_TYPE(dev_priv) == PCH_DG2)
-#define HAS_PCH_ADP(dev_priv)                  (INTEL_PCH_TYPE(dev_priv) == PCH_ADP)
-#define HAS_PCH_DG1(dev_priv)                  (INTEL_PCH_TYPE(dev_priv) == PCH_DG1)
-#define HAS_PCH_TGP(dev_priv)                  (INTEL_PCH_TYPE(dev_priv) == PCH_TGP)
-#define HAS_PCH_ICP(dev_priv)                  (INTEL_PCH_TYPE(dev_priv) == PCH_ICP)
-#define HAS_PCH_CNP(dev_priv)                  (INTEL_PCH_TYPE(dev_priv) == PCH_CNP)
-#define HAS_PCH_SPT(dev_priv)                  (INTEL_PCH_TYPE(dev_priv) == PCH_SPT)
-#define HAS_PCH_LPT(dev_priv)                  (INTEL_PCH_TYPE(dev_priv) == PCH_LPT)
-#define HAS_PCH_LPT_LP(dev_priv) \
-       (INTEL_PCH_ID(dev_priv) == INTEL_PCH_LPT_LP_DEVICE_ID_TYPE || \
-        INTEL_PCH_ID(dev_priv) == INTEL_PCH_WPT_LP_DEVICE_ID_TYPE)
-#define HAS_PCH_LPT_H(dev_priv) \
-       (INTEL_PCH_ID(dev_priv) == INTEL_PCH_LPT_DEVICE_ID_TYPE || \
-        INTEL_PCH_ID(dev_priv) == INTEL_PCH_WPT_DEVICE_ID_TYPE)
-#define HAS_PCH_CPT(dev_priv)                  (INTEL_PCH_TYPE(dev_priv) == PCH_CPT)
-#define HAS_PCH_IBX(dev_priv)                  (INTEL_PCH_TYPE(dev_priv) == PCH_IBX)
-#define HAS_PCH_NOP(dev_priv)                  (INTEL_PCH_TYPE(dev_priv) == PCH_NOP)
-#define HAS_PCH_SPLIT(dev_priv)                        (INTEL_PCH_TYPE(dev_priv) != PCH_NONE)
-
-void intel_detect_pch(struct drm_i915_private *dev_priv);
-
-#endif /* __INTEL_PCH__ */
diff --git a/drivers/gpu/drm/i915/soc/intel_dram.c b/drivers/gpu/drm/i915/soc/intel_dram.c
new file mode 100644 (file)
index 0000000..bba8cb6
--- /dev/null
@@ -0,0 +1,572 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2020 Intel Corporation
+ */
+
+#include <linux/string_helpers.h>
+
+#include "i915_drv.h"
+#include "i915_reg.h"
+#include "intel_dram.h"
+#include "intel_mchbar_regs.h"
+#include "intel_pcode.h"
+
+struct dram_dimm_info {
+       u16 size;
+       u8 width, ranks;
+};
+
+struct dram_channel_info {
+       struct dram_dimm_info dimm_l, dimm_s;
+       u8 ranks;
+       bool is_16gb_dimm;
+};
+
+#define DRAM_TYPE_STR(type) [INTEL_DRAM_ ## type] = #type
+
+static const char *intel_dram_type_str(enum intel_dram_type type)
+{
+       static const char * const str[] = {
+               DRAM_TYPE_STR(UNKNOWN),
+               DRAM_TYPE_STR(DDR3),
+               DRAM_TYPE_STR(DDR4),
+               DRAM_TYPE_STR(LPDDR3),
+               DRAM_TYPE_STR(LPDDR4),
+       };
+
+       if (type >= ARRAY_SIZE(str))
+               type = INTEL_DRAM_UNKNOWN;
+
+       return str[type];
+}
+
+#undef DRAM_TYPE_STR
+
+static int intel_dimm_num_devices(const struct dram_dimm_info *dimm)
+{
+       return dimm->ranks * 64 / (dimm->width ?: 1);
+}
+
+/* Returns total Gb for the whole DIMM */
+static int skl_get_dimm_size(u16 val)
+{
+       return (val & SKL_DRAM_SIZE_MASK) * 8;
+}
+
+static int skl_get_dimm_width(u16 val)
+{
+       if (skl_get_dimm_size(val) == 0)
+               return 0;
+
+       switch (val & SKL_DRAM_WIDTH_MASK) {
+       case SKL_DRAM_WIDTH_X8:
+       case SKL_DRAM_WIDTH_X16:
+       case SKL_DRAM_WIDTH_X32:
+               val = (val & SKL_DRAM_WIDTH_MASK) >> SKL_DRAM_WIDTH_SHIFT;
+               return 8 << val;
+       default:
+               MISSING_CASE(val);
+               return 0;
+       }
+}
+
+static int skl_get_dimm_ranks(u16 val)
+{
+       if (skl_get_dimm_size(val) == 0)
+               return 0;
+
+       val = (val & SKL_DRAM_RANK_MASK) >> SKL_DRAM_RANK_SHIFT;
+
+       return val + 1;
+}
+
+/* Returns total Gb for the whole DIMM */
+static int icl_get_dimm_size(u16 val)
+{
+       return (val & ICL_DRAM_SIZE_MASK) * 8 / 2;
+}
+
+static int icl_get_dimm_width(u16 val)
+{
+       if (icl_get_dimm_size(val) == 0)
+               return 0;
+
+       switch (val & ICL_DRAM_WIDTH_MASK) {
+       case ICL_DRAM_WIDTH_X8:
+       case ICL_DRAM_WIDTH_X16:
+       case ICL_DRAM_WIDTH_X32:
+               val = (val & ICL_DRAM_WIDTH_MASK) >> ICL_DRAM_WIDTH_SHIFT;
+               return 8 << val;
+       default:
+               MISSING_CASE(val);
+               return 0;
+       }
+}
+
+static int icl_get_dimm_ranks(u16 val)
+{
+       if (icl_get_dimm_size(val) == 0)
+               return 0;
+
+       val = (val & ICL_DRAM_RANK_MASK) >> ICL_DRAM_RANK_SHIFT;
+
+       return val + 1;
+}
+
+static bool
+skl_is_16gb_dimm(const struct dram_dimm_info *dimm)
+{
+       /* Convert total Gb to Gb per DRAM device */
+       return dimm->size / (intel_dimm_num_devices(dimm) ?: 1) == 16;
+}
+
+static void
+skl_dram_get_dimm_info(struct drm_i915_private *i915,
+                      struct dram_dimm_info *dimm,
+                      int channel, char dimm_name, u16 val)
+{
+       if (GRAPHICS_VER(i915) >= 11) {
+               dimm->size = icl_get_dimm_size(val);
+               dimm->width = icl_get_dimm_width(val);
+               dimm->ranks = icl_get_dimm_ranks(val);
+       } else {
+               dimm->size = skl_get_dimm_size(val);
+               dimm->width = skl_get_dimm_width(val);
+               dimm->ranks = skl_get_dimm_ranks(val);
+       }
+
+       drm_dbg_kms(&i915->drm,
+                   "CH%u DIMM %c size: %u Gb, width: X%u, ranks: %u, 16Gb DIMMs: %s\n",
+                   channel, dimm_name, dimm->size, dimm->width, dimm->ranks,
+                   str_yes_no(skl_is_16gb_dimm(dimm)));
+}
+
+static int
+skl_dram_get_channel_info(struct drm_i915_private *i915,
+                         struct dram_channel_info *ch,
+                         int channel, u32 val)
+{
+       skl_dram_get_dimm_info(i915, &ch->dimm_l,
+                              channel, 'L', val & 0xffff);
+       skl_dram_get_dimm_info(i915, &ch->dimm_s,
+                              channel, 'S', val >> 16);
+
+       if (ch->dimm_l.size == 0 && ch->dimm_s.size == 0) {
+               drm_dbg_kms(&i915->drm, "CH%u not populated\n", channel);
+               return -EINVAL;
+       }
+
+       if (ch->dimm_l.ranks == 2 || ch->dimm_s.ranks == 2)
+               ch->ranks = 2;
+       else if (ch->dimm_l.ranks == 1 && ch->dimm_s.ranks == 1)
+               ch->ranks = 2;
+       else
+               ch->ranks = 1;
+
+       ch->is_16gb_dimm = skl_is_16gb_dimm(&ch->dimm_l) ||
+               skl_is_16gb_dimm(&ch->dimm_s);
+
+       drm_dbg_kms(&i915->drm, "CH%u ranks: %u, 16Gb DIMMs: %s\n",
+                   channel, ch->ranks, str_yes_no(ch->is_16gb_dimm));
+
+       return 0;
+}
+
+static bool
+intel_is_dram_symmetric(const struct dram_channel_info *ch0,
+                       const struct dram_channel_info *ch1)
+{
+       return !memcmp(ch0, ch1, sizeof(*ch0)) &&
+               (ch0->dimm_s.size == 0 ||
+                !memcmp(&ch0->dimm_l, &ch0->dimm_s, sizeof(ch0->dimm_l)));
+}
+
+static int
+skl_dram_get_channels_info(struct drm_i915_private *i915)
+{
+       struct dram_info *dram_info = &i915->dram_info;
+       struct dram_channel_info ch0 = {}, ch1 = {};
+       u32 val;
+       int ret;
+
+       val = intel_uncore_read(&i915->uncore,
+                               SKL_MAD_DIMM_CH0_0_0_0_MCHBAR_MCMAIN);
+       ret = skl_dram_get_channel_info(i915, &ch0, 0, val);
+       if (ret == 0)
+               dram_info->num_channels++;
+
+       val = intel_uncore_read(&i915->uncore,
+                               SKL_MAD_DIMM_CH1_0_0_0_MCHBAR_MCMAIN);
+       ret = skl_dram_get_channel_info(i915, &ch1, 1, val);
+       if (ret == 0)
+               dram_info->num_channels++;
+
+       if (dram_info->num_channels == 0) {
+               drm_info(&i915->drm, "Number of memory channels is zero\n");
+               return -EINVAL;
+       }
+
+       if (ch0.ranks == 0 && ch1.ranks == 0) {
+               drm_info(&i915->drm, "couldn't get memory rank information\n");
+               return -EINVAL;
+       }
+
+       dram_info->wm_lv_0_adjust_needed = ch0.is_16gb_dimm || ch1.is_16gb_dimm;
+
+       dram_info->symmetric_memory = intel_is_dram_symmetric(&ch0, &ch1);
+
+       drm_dbg_kms(&i915->drm, "Memory configuration is symmetric? %s\n",
+                   str_yes_no(dram_info->symmetric_memory));
+
+       return 0;
+}
+
+static enum intel_dram_type
+skl_get_dram_type(struct drm_i915_private *i915)
+{
+       u32 val;
+
+       val = intel_uncore_read(&i915->uncore,
+                               SKL_MAD_INTER_CHANNEL_0_0_0_MCHBAR_MCMAIN);
+
+       switch (val & SKL_DRAM_DDR_TYPE_MASK) {
+       case SKL_DRAM_DDR_TYPE_DDR3:
+               return INTEL_DRAM_DDR3;
+       case SKL_DRAM_DDR_TYPE_DDR4:
+               return INTEL_DRAM_DDR4;
+       case SKL_DRAM_DDR_TYPE_LPDDR3:
+               return INTEL_DRAM_LPDDR3;
+       case SKL_DRAM_DDR_TYPE_LPDDR4:
+               return INTEL_DRAM_LPDDR4;
+       default:
+               MISSING_CASE(val);
+               return INTEL_DRAM_UNKNOWN;
+       }
+}
+
+static int
+skl_get_dram_info(struct drm_i915_private *i915)
+{
+       struct dram_info *dram_info = &i915->dram_info;
+       int ret;
+
+       dram_info->type = skl_get_dram_type(i915);
+       drm_dbg_kms(&i915->drm, "DRAM type: %s\n",
+                   intel_dram_type_str(dram_info->type));
+
+       ret = skl_dram_get_channels_info(i915);
+       if (ret)
+               return ret;
+
+       return 0;
+}
+
+/* Returns Gb per DRAM device */
+static int bxt_get_dimm_size(u32 val)
+{
+       switch (val & BXT_DRAM_SIZE_MASK) {
+       case BXT_DRAM_SIZE_4GBIT:
+               return 4;
+       case BXT_DRAM_SIZE_6GBIT:
+               return 6;
+       case BXT_DRAM_SIZE_8GBIT:
+               return 8;
+       case BXT_DRAM_SIZE_12GBIT:
+               return 12;
+       case BXT_DRAM_SIZE_16GBIT:
+               return 16;
+       default:
+               MISSING_CASE(val);
+               return 0;
+       }
+}
+
+static int bxt_get_dimm_width(u32 val)
+{
+       if (!bxt_get_dimm_size(val))
+               return 0;
+
+       val = (val & BXT_DRAM_WIDTH_MASK) >> BXT_DRAM_WIDTH_SHIFT;
+
+       return 8 << val;
+}
+
+static int bxt_get_dimm_ranks(u32 val)
+{
+       if (!bxt_get_dimm_size(val))
+               return 0;
+
+       switch (val & BXT_DRAM_RANK_MASK) {
+       case BXT_DRAM_RANK_SINGLE:
+               return 1;
+       case BXT_DRAM_RANK_DUAL:
+               return 2;
+       default:
+               MISSING_CASE(val);
+               return 0;
+       }
+}
+
+static enum intel_dram_type bxt_get_dimm_type(u32 val)
+{
+       if (!bxt_get_dimm_size(val))
+               return INTEL_DRAM_UNKNOWN;
+
+       switch (val & BXT_DRAM_TYPE_MASK) {
+       case BXT_DRAM_TYPE_DDR3:
+               return INTEL_DRAM_DDR3;
+       case BXT_DRAM_TYPE_LPDDR3:
+               return INTEL_DRAM_LPDDR3;
+       case BXT_DRAM_TYPE_DDR4:
+               return INTEL_DRAM_DDR4;
+       case BXT_DRAM_TYPE_LPDDR4:
+               return INTEL_DRAM_LPDDR4;
+       default:
+               MISSING_CASE(val);
+               return INTEL_DRAM_UNKNOWN;
+       }
+}
+
+static void bxt_get_dimm_info(struct dram_dimm_info *dimm, u32 val)
+{
+       dimm->width = bxt_get_dimm_width(val);
+       dimm->ranks = bxt_get_dimm_ranks(val);
+
+       /*
+        * Size in register is Gb per DRAM device. Convert to total
+        * Gb to match the way we report this for non-LP platforms.
+        */
+       dimm->size = bxt_get_dimm_size(val) * intel_dimm_num_devices(dimm);
+}
+
+static int bxt_get_dram_info(struct drm_i915_private *i915)
+{
+       struct dram_info *dram_info = &i915->dram_info;
+       u32 val;
+       u8 valid_ranks = 0;
+       int i;
+
+       /*
+        * Now read each DUNIT8/9/10/11 to check the rank of each dimms.
+        */
+       for (i = BXT_D_CR_DRP0_DUNIT_START; i <= BXT_D_CR_DRP0_DUNIT_END; i++) {
+               struct dram_dimm_info dimm;
+               enum intel_dram_type type;
+
+               val = intel_uncore_read(&i915->uncore, BXT_D_CR_DRP0_DUNIT(i));
+               if (val == 0xFFFFFFFF)
+                       continue;
+
+               dram_info->num_channels++;
+
+               bxt_get_dimm_info(&dimm, val);
+               type = bxt_get_dimm_type(val);
+
+               drm_WARN_ON(&i915->drm, type != INTEL_DRAM_UNKNOWN &&
+                           dram_info->type != INTEL_DRAM_UNKNOWN &&
+                           dram_info->type != type);
+
+               drm_dbg_kms(&i915->drm,
+                           "CH%u DIMM size: %u Gb, width: X%u, ranks: %u, type: %s\n",
+                           i - BXT_D_CR_DRP0_DUNIT_START,
+                           dimm.size, dimm.width, dimm.ranks,
+                           intel_dram_type_str(type));
+
+               if (valid_ranks == 0)
+                       valid_ranks = dimm.ranks;
+
+               if (type != INTEL_DRAM_UNKNOWN)
+                       dram_info->type = type;
+       }
+
+       if (dram_info->type == INTEL_DRAM_UNKNOWN || valid_ranks == 0) {
+               drm_info(&i915->drm, "couldn't get memory information\n");
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+static int icl_pcode_read_mem_global_info(struct drm_i915_private *dev_priv)
+{
+       struct dram_info *dram_info = &dev_priv->dram_info;
+       u32 val = 0;
+       int ret;
+
+       ret = snb_pcode_read(&dev_priv->uncore, ICL_PCODE_MEM_SUBSYSYSTEM_INFO |
+                            ICL_PCODE_MEM_SS_READ_GLOBAL_INFO, &val, NULL);
+       if (ret)
+               return ret;
+
+       if (GRAPHICS_VER(dev_priv) == 12) {
+               switch (val & 0xf) {
+               case 0:
+                       dram_info->type = INTEL_DRAM_DDR4;
+                       break;
+               case 1:
+                       dram_info->type = INTEL_DRAM_DDR5;
+                       break;
+               case 2:
+                       dram_info->type = INTEL_DRAM_LPDDR5;
+                       break;
+               case 3:
+                       dram_info->type = INTEL_DRAM_LPDDR4;
+                       break;
+               case 4:
+                       dram_info->type = INTEL_DRAM_DDR3;
+                       break;
+               case 5:
+                       dram_info->type = INTEL_DRAM_LPDDR3;
+                       break;
+               default:
+                       MISSING_CASE(val & 0xf);
+                       return -EINVAL;
+               }
+       } else {
+               switch (val & 0xf) {
+               case 0:
+                       dram_info->type = INTEL_DRAM_DDR4;
+                       break;
+               case 1:
+                       dram_info->type = INTEL_DRAM_DDR3;
+                       break;
+               case 2:
+                       dram_info->type = INTEL_DRAM_LPDDR3;
+                       break;
+               case 3:
+                       dram_info->type = INTEL_DRAM_LPDDR4;
+                       break;
+               default:
+                       MISSING_CASE(val & 0xf);
+                       return -EINVAL;
+               }
+       }
+
+       dram_info->num_channels = (val & 0xf0) >> 4;
+       dram_info->num_qgv_points = (val & 0xf00) >> 8;
+       dram_info->num_psf_gv_points = (val & 0x3000) >> 12;
+
+       return 0;
+}
+
+static int gen11_get_dram_info(struct drm_i915_private *i915)
+{
+       int ret = skl_get_dram_info(i915);
+
+       if (ret)
+               return ret;
+
+       return icl_pcode_read_mem_global_info(i915);
+}
+
+static int gen12_get_dram_info(struct drm_i915_private *i915)
+{
+       i915->dram_info.wm_lv_0_adjust_needed = false;
+
+       return icl_pcode_read_mem_global_info(i915);
+}
+
+static int xelpdp_get_dram_info(struct drm_i915_private *i915)
+{
+       u32 val = intel_uncore_read(&i915->uncore, MTL_MEM_SS_INFO_GLOBAL);
+       struct dram_info *dram_info = &i915->dram_info;
+
+       switch (REG_FIELD_GET(MTL_DDR_TYPE_MASK, val)) {
+       case 0:
+               dram_info->type = INTEL_DRAM_DDR4;
+               break;
+       case 1:
+               dram_info->type = INTEL_DRAM_DDR5;
+               break;
+       case 2:
+               dram_info->type = INTEL_DRAM_LPDDR5;
+               break;
+       case 3:
+               dram_info->type = INTEL_DRAM_LPDDR4;
+               break;
+       case 4:
+               dram_info->type = INTEL_DRAM_DDR3;
+               break;
+       case 5:
+               dram_info->type = INTEL_DRAM_LPDDR3;
+               break;
+       default:
+               MISSING_CASE(val);
+               return -EINVAL;
+       }
+
+       dram_info->num_channels = REG_FIELD_GET(MTL_N_OF_POPULATED_CH_MASK, val);
+       dram_info->num_qgv_points = REG_FIELD_GET(MTL_N_OF_ENABLED_QGV_POINTS_MASK, val);
+       /* PSF GV points not supported in D14+ */
+
+       return 0;
+}
+
+void intel_dram_detect(struct drm_i915_private *i915)
+{
+       struct dram_info *dram_info = &i915->dram_info;
+       int ret;
+
+       if (GRAPHICS_VER(i915) < 9 || IS_DG2(i915) || !HAS_DISPLAY(i915))
+               return;
+
+       /*
+        * Assume level 0 watermark latency adjustment is needed until proven
+        * otherwise, this w/a is not needed by bxt/glk.
+        */
+       dram_info->wm_lv_0_adjust_needed = !IS_GEN9_LP(i915);
+
+       if (DISPLAY_VER(i915) >= 14)
+               ret = xelpdp_get_dram_info(i915);
+       else if (GRAPHICS_VER(i915) >= 12)
+               ret = gen12_get_dram_info(i915);
+       else if (GRAPHICS_VER(i915) >= 11)
+               ret = gen11_get_dram_info(i915);
+       else if (IS_GEN9_LP(i915))
+               ret = bxt_get_dram_info(i915);
+       else
+               ret = skl_get_dram_info(i915);
+       if (ret)
+               return;
+
+       drm_dbg_kms(&i915->drm, "DRAM channels: %u\n", dram_info->num_channels);
+
+       drm_dbg_kms(&i915->drm, "Watermark level 0 adjustment needed: %s\n",
+                   str_yes_no(dram_info->wm_lv_0_adjust_needed));
+}
+
+static u32 gen9_edram_size_mb(struct drm_i915_private *i915, u32 cap)
+{
+       static const u8 ways[8] = { 4, 8, 12, 16, 16, 16, 16, 16 };
+       static const u8 sets[4] = { 1, 1, 2, 2 };
+
+       return EDRAM_NUM_BANKS(cap) *
+               ways[EDRAM_WAYS_IDX(cap)] *
+               sets[EDRAM_SETS_IDX(cap)];
+}
+
+void intel_dram_edram_detect(struct drm_i915_private *i915)
+{
+       u32 edram_cap = 0;
+
+       if (!(IS_HASWELL(i915) || IS_BROADWELL(i915) || GRAPHICS_VER(i915) >= 9))
+               return;
+
+       edram_cap = __raw_uncore_read32(&i915->uncore, HSW_EDRAM_CAP);
+
+       /* NB: We can't write IDICR yet because we don't have gt funcs set up */
+
+       if (!(edram_cap & EDRAM_ENABLED))
+               return;
+
+       /*
+        * The needed capability bits for size calculation are not there with
+        * pre gen9 so return 128MB always.
+        */
+       if (GRAPHICS_VER(i915) < 9)
+               i915->edram_size_mb = 128;
+       else
+               i915->edram_size_mb = gen9_edram_size_mb(i915, edram_cap);
+
+       drm_info(&i915->drm, "Found %uMB of eDRAM\n", i915->edram_size_mb);
+}
diff --git a/drivers/gpu/drm/i915/soc/intel_dram.h b/drivers/gpu/drm/i915/soc/intel_dram.h
new file mode 100644 (file)
index 0000000..4ba13c1
--- /dev/null
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2020 Intel Corporation
+ */
+
+#ifndef __INTEL_DRAM_H__
+#define __INTEL_DRAM_H__
+
+struct drm_i915_private;
+
+void intel_dram_edram_detect(struct drm_i915_private *i915);
+void intel_dram_detect(struct drm_i915_private *i915);
+
+#endif /* __INTEL_DRAM_H__ */
diff --git a/drivers/gpu/drm/i915/soc/intel_pch.c b/drivers/gpu/drm/i915/soc/intel_pch.c
new file mode 100644 (file)
index 0000000..ba9843c
--- /dev/null
@@ -0,0 +1,279 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright 2019 Intel Corporation.
+ */
+
+#include "i915_drv.h"
+#include "i915_utils.h"
+#include "intel_pch.h"
+
+/* Map PCH device id to PCH type, or PCH_NONE if unknown. */
+static enum intel_pch
+intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)
+{
+       switch (id) {
+       case INTEL_PCH_IBX_DEVICE_ID_TYPE:
+               drm_dbg_kms(&dev_priv->drm, "Found Ibex Peak PCH\n");
+               drm_WARN_ON(&dev_priv->drm, GRAPHICS_VER(dev_priv) != 5);
+               return PCH_IBX;
+       case INTEL_PCH_CPT_DEVICE_ID_TYPE:
+               drm_dbg_kms(&dev_priv->drm, "Found CougarPoint PCH\n");
+               drm_WARN_ON(&dev_priv->drm,
+                           GRAPHICS_VER(dev_priv) != 6 && !IS_IVYBRIDGE(dev_priv));
+               return PCH_CPT;
+       case INTEL_PCH_PPT_DEVICE_ID_TYPE:
+               drm_dbg_kms(&dev_priv->drm, "Found PantherPoint PCH\n");
+               drm_WARN_ON(&dev_priv->drm,
+                           GRAPHICS_VER(dev_priv) != 6 && !IS_IVYBRIDGE(dev_priv));
+               /* PPT is CPT compatible */
+               return PCH_CPT;
+       case INTEL_PCH_LPT_DEVICE_ID_TYPE:
+               drm_dbg_kms(&dev_priv->drm, "Found LynxPoint PCH\n");
+               drm_WARN_ON(&dev_priv->drm,
+                           !IS_HASWELL(dev_priv) && !IS_BROADWELL(dev_priv));
+               drm_WARN_ON(&dev_priv->drm,
+                           IS_HSW_ULT(dev_priv) || IS_BDW_ULT(dev_priv));
+               return PCH_LPT;
+       case INTEL_PCH_LPT_LP_DEVICE_ID_TYPE:
+               drm_dbg_kms(&dev_priv->drm, "Found LynxPoint LP PCH\n");
+               drm_WARN_ON(&dev_priv->drm,
+                           !IS_HASWELL(dev_priv) && !IS_BROADWELL(dev_priv));
+               drm_WARN_ON(&dev_priv->drm,
+                           !IS_HSW_ULT(dev_priv) && !IS_BDW_ULT(dev_priv));
+               return PCH_LPT;
+       case INTEL_PCH_WPT_DEVICE_ID_TYPE:
+               drm_dbg_kms(&dev_priv->drm, "Found WildcatPoint PCH\n");
+               drm_WARN_ON(&dev_priv->drm,
+                           !IS_HASWELL(dev_priv) && !IS_BROADWELL(dev_priv));
+               drm_WARN_ON(&dev_priv->drm,
+                           IS_HSW_ULT(dev_priv) || IS_BDW_ULT(dev_priv));
+               /* WPT is LPT compatible */
+               return PCH_LPT;
+       case INTEL_PCH_WPT_LP_DEVICE_ID_TYPE:
+               drm_dbg_kms(&dev_priv->drm, "Found WildcatPoint LP PCH\n");
+               drm_WARN_ON(&dev_priv->drm,
+                           !IS_HASWELL(dev_priv) && !IS_BROADWELL(dev_priv));
+               drm_WARN_ON(&dev_priv->drm,
+                           !IS_HSW_ULT(dev_priv) && !IS_BDW_ULT(dev_priv));
+               /* WPT is LPT compatible */
+               return PCH_LPT;
+       case INTEL_PCH_SPT_DEVICE_ID_TYPE:
+               drm_dbg_kms(&dev_priv->drm, "Found SunrisePoint PCH\n");
+               drm_WARN_ON(&dev_priv->drm,
+                           !IS_SKYLAKE(dev_priv) && !IS_KABYLAKE(dev_priv));
+               return PCH_SPT;
+       case INTEL_PCH_SPT_LP_DEVICE_ID_TYPE:
+               drm_dbg_kms(&dev_priv->drm, "Found SunrisePoint LP PCH\n");
+               drm_WARN_ON(&dev_priv->drm,
+                           !IS_SKYLAKE(dev_priv) &&
+                           !IS_KABYLAKE(dev_priv) &&
+                           !IS_COFFEELAKE(dev_priv) &&
+                           !IS_COMETLAKE(dev_priv));
+               return PCH_SPT;
+       case INTEL_PCH_KBP_DEVICE_ID_TYPE:
+               drm_dbg_kms(&dev_priv->drm, "Found Kaby Lake PCH (KBP)\n");
+               drm_WARN_ON(&dev_priv->drm,
+                           !IS_SKYLAKE(dev_priv) &&
+                           !IS_KABYLAKE(dev_priv) &&
+                           !IS_COFFEELAKE(dev_priv) &&
+                           !IS_COMETLAKE(dev_priv));
+               /* KBP is SPT compatible */
+               return PCH_SPT;
+       case INTEL_PCH_CNP_DEVICE_ID_TYPE:
+               drm_dbg_kms(&dev_priv->drm, "Found Cannon Lake PCH (CNP)\n");
+               drm_WARN_ON(&dev_priv->drm,
+                           !IS_COFFEELAKE(dev_priv) &&
+                           !IS_COMETLAKE(dev_priv));
+               return PCH_CNP;
+       case INTEL_PCH_CNP_LP_DEVICE_ID_TYPE:
+               drm_dbg_kms(&dev_priv->drm,
+                           "Found Cannon Lake LP PCH (CNP-LP)\n");
+               drm_WARN_ON(&dev_priv->drm,
+                           !IS_COFFEELAKE(dev_priv) &&
+                           !IS_COMETLAKE(dev_priv));
+               return PCH_CNP;
+       case INTEL_PCH_CMP_DEVICE_ID_TYPE:
+       case INTEL_PCH_CMP2_DEVICE_ID_TYPE:
+               drm_dbg_kms(&dev_priv->drm, "Found Comet Lake PCH (CMP)\n");
+               drm_WARN_ON(&dev_priv->drm,
+                           !IS_COFFEELAKE(dev_priv) &&
+                           !IS_COMETLAKE(dev_priv) &&
+                           !IS_ROCKETLAKE(dev_priv));
+               /* CMP is CNP compatible */
+               return PCH_CNP;
+       case INTEL_PCH_CMP_V_DEVICE_ID_TYPE:
+               drm_dbg_kms(&dev_priv->drm, "Found Comet Lake V PCH (CMP-V)\n");
+               drm_WARN_ON(&dev_priv->drm,
+                           !IS_COFFEELAKE(dev_priv) &&
+                           !IS_COMETLAKE(dev_priv));
+               /* CMP-V is based on KBP, which is SPT compatible */
+               return PCH_SPT;
+       case INTEL_PCH_ICP_DEVICE_ID_TYPE:
+       case INTEL_PCH_ICP2_DEVICE_ID_TYPE:
+               drm_dbg_kms(&dev_priv->drm, "Found Ice Lake PCH\n");
+               drm_WARN_ON(&dev_priv->drm, !IS_ICELAKE(dev_priv));
+               return PCH_ICP;
+       case INTEL_PCH_MCC_DEVICE_ID_TYPE:
+               drm_dbg_kms(&dev_priv->drm, "Found Mule Creek Canyon PCH\n");
+               drm_WARN_ON(&dev_priv->drm, !IS_JSL_EHL(dev_priv));
+               /* MCC is TGP compatible */
+               return PCH_TGP;
+       case INTEL_PCH_TGP_DEVICE_ID_TYPE:
+       case INTEL_PCH_TGP2_DEVICE_ID_TYPE:
+               drm_dbg_kms(&dev_priv->drm, "Found Tiger Lake LP PCH\n");
+               drm_WARN_ON(&dev_priv->drm, !IS_TIGERLAKE(dev_priv) &&
+                           !IS_ROCKETLAKE(dev_priv) &&
+                           !IS_GEN9_BC(dev_priv));
+               return PCH_TGP;
+       case INTEL_PCH_JSP_DEVICE_ID_TYPE:
+               drm_dbg_kms(&dev_priv->drm, "Found Jasper Lake PCH\n");
+               drm_WARN_ON(&dev_priv->drm, !IS_JSL_EHL(dev_priv));
+               /* JSP is ICP compatible */
+               return PCH_ICP;
+       case INTEL_PCH_ADP_DEVICE_ID_TYPE:
+       case INTEL_PCH_ADP2_DEVICE_ID_TYPE:
+       case INTEL_PCH_ADP3_DEVICE_ID_TYPE:
+       case INTEL_PCH_ADP4_DEVICE_ID_TYPE:
+               drm_dbg_kms(&dev_priv->drm, "Found Alder Lake PCH\n");
+               drm_WARN_ON(&dev_priv->drm, !IS_ALDERLAKE_S(dev_priv) &&
+                           !IS_ALDERLAKE_P(dev_priv));
+               return PCH_ADP;
+       case INTEL_PCH_MTP_DEVICE_ID_TYPE:
+       case INTEL_PCH_MTP2_DEVICE_ID_TYPE:
+               drm_dbg_kms(&dev_priv->drm, "Found Meteor Lake PCH\n");
+               drm_WARN_ON(&dev_priv->drm, !IS_METEORLAKE(dev_priv));
+               return PCH_MTP;
+       default:
+               return PCH_NONE;
+       }
+}
+
+static bool intel_is_virt_pch(unsigned short id,
+                             unsigned short svendor, unsigned short sdevice)
+{
+       return (id == INTEL_PCH_P2X_DEVICE_ID_TYPE ||
+               id == INTEL_PCH_P3X_DEVICE_ID_TYPE ||
+               (id == INTEL_PCH_QEMU_DEVICE_ID_TYPE &&
+                svendor == PCI_SUBVENDOR_ID_REDHAT_QUMRANET &&
+                sdevice == PCI_SUBDEVICE_ID_QEMU));
+}
+
+static void
+intel_virt_detect_pch(const struct drm_i915_private *dev_priv,
+                     unsigned short *pch_id, enum intel_pch *pch_type)
+{
+       unsigned short id = 0;
+
+       /*
+        * In a virtualized passthrough environment we can be in a
+        * setup where the ISA bridge is not able to be passed through.
+        * In this case, a south bridge can be emulated and we have to
+        * make an educated guess as to which PCH is really there.
+        */
+
+       if (IS_METEORLAKE(dev_priv))
+               id = INTEL_PCH_MTP_DEVICE_ID_TYPE;
+       else if (IS_ALDERLAKE_S(dev_priv) || IS_ALDERLAKE_P(dev_priv))
+               id = INTEL_PCH_ADP_DEVICE_ID_TYPE;
+       else if (IS_TIGERLAKE(dev_priv) || IS_ROCKETLAKE(dev_priv))
+               id = INTEL_PCH_TGP_DEVICE_ID_TYPE;
+       else if (IS_JSL_EHL(dev_priv))
+               id = INTEL_PCH_MCC_DEVICE_ID_TYPE;
+       else if (IS_ICELAKE(dev_priv))
+               id = INTEL_PCH_ICP_DEVICE_ID_TYPE;
+       else if (IS_COFFEELAKE(dev_priv) ||
+                IS_COMETLAKE(dev_priv))
+               id = INTEL_PCH_CNP_DEVICE_ID_TYPE;
+       else if (IS_KABYLAKE(dev_priv) || IS_SKYLAKE(dev_priv))
+               id = INTEL_PCH_SPT_DEVICE_ID_TYPE;
+       else if (IS_HSW_ULT(dev_priv) || IS_BDW_ULT(dev_priv))
+               id = INTEL_PCH_LPT_LP_DEVICE_ID_TYPE;
+       else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
+               id = INTEL_PCH_LPT_DEVICE_ID_TYPE;
+       else if (GRAPHICS_VER(dev_priv) == 6 || IS_IVYBRIDGE(dev_priv))
+               id = INTEL_PCH_CPT_DEVICE_ID_TYPE;
+       else if (GRAPHICS_VER(dev_priv) == 5)
+               id = INTEL_PCH_IBX_DEVICE_ID_TYPE;
+
+       if (id)
+               drm_dbg_kms(&dev_priv->drm, "Assuming PCH ID %04x\n", id);
+       else
+               drm_dbg_kms(&dev_priv->drm, "Assuming no PCH\n");
+
+       *pch_type = intel_pch_type(dev_priv, id);
+
+       /* Sanity check virtual PCH id */
+       if (drm_WARN_ON(&dev_priv->drm,
+                       id && *pch_type == PCH_NONE))
+               id = 0;
+
+       *pch_id = id;
+}
+
+void intel_detect_pch(struct drm_i915_private *dev_priv)
+{
+       struct pci_dev *pch = NULL;
+       unsigned short id;
+       enum intel_pch pch_type;
+
+       /* DG1 has south engine display on the same PCI device */
+       if (IS_DG1(dev_priv)) {
+               dev_priv->pch_type = PCH_DG1;
+               return;
+       } else if (IS_DG2(dev_priv)) {
+               dev_priv->pch_type = PCH_DG2;
+               return;
+       }
+
+       /*
+        * The reason to probe ISA bridge instead of Dev31:Fun0 is to
+        * make graphics device passthrough work easy for VMM, that only
+        * need to expose ISA bridge to let driver know the real hardware
+        * underneath. This is a requirement from virtualization team.
+        *
+        * In some virtualized environments (e.g. XEN), there is irrelevant
+        * ISA bridge in the system. To work reliably, we should scan trhough
+        * all the ISA bridge devices and check for the first match, instead
+        * of only checking the first one.
+        */
+       while ((pch = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, pch))) {
+               if (pch->vendor != PCI_VENDOR_ID_INTEL)
+                       continue;
+
+               id = pch->device & INTEL_PCH_DEVICE_ID_MASK;
+
+               pch_type = intel_pch_type(dev_priv, id);
+               if (pch_type != PCH_NONE) {
+                       dev_priv->pch_type = pch_type;
+                       dev_priv->pch_id = id;
+                       break;
+               } else if (intel_is_virt_pch(id, pch->subsystem_vendor,
+                                            pch->subsystem_device)) {
+                       intel_virt_detect_pch(dev_priv, &id, &pch_type);
+                       dev_priv->pch_type = pch_type;
+                       dev_priv->pch_id = id;
+                       break;
+               }
+       }
+
+       /*
+        * Use PCH_NOP (PCH but no South Display) for PCH platforms without
+        * display.
+        */
+       if (pch && !HAS_DISPLAY(dev_priv)) {
+               drm_dbg_kms(&dev_priv->drm,
+                           "Display disabled, reverting to NOP PCH\n");
+               dev_priv->pch_type = PCH_NOP;
+               dev_priv->pch_id = 0;
+       } else if (!pch) {
+               if (i915_run_as_guest() && HAS_DISPLAY(dev_priv)) {
+                       intel_virt_detect_pch(dev_priv, &id, &pch_type);
+                       dev_priv->pch_type = pch_type;
+                       dev_priv->pch_id = id;
+               } else {
+                       drm_dbg_kms(&dev_priv->drm, "No PCH found.\n");
+               }
+       }
+
+       pci_dev_put(pch);
+}
diff --git a/drivers/gpu/drm/i915/soc/intel_pch.h b/drivers/gpu/drm/i915/soc/intel_pch.h
new file mode 100644 (file)
index 0000000..32aff5a
--- /dev/null
@@ -0,0 +1,91 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright 2019 Intel Corporation.
+ */
+
+#ifndef __INTEL_PCH__
+#define __INTEL_PCH__
+
+struct drm_i915_private;
+
+/*
+ * Sorted by south display engine compatibility.
+ * If the new PCH comes with a south display engine that is not
+ * inherited from the latest item, please do not add it to the
+ * end. Instead, add it right after its "parent" PCH.
+ */
+enum intel_pch {
+       PCH_NOP = -1,   /* PCH without south display */
+       PCH_NONE = 0,   /* No PCH present */
+       PCH_IBX,        /* Ibexpeak PCH */
+       PCH_CPT,        /* Cougarpoint/Pantherpoint PCH */
+       PCH_LPT,        /* Lynxpoint/Wildcatpoint PCH */
+       PCH_SPT,        /* Sunrisepoint/Kaby Lake PCH */
+       PCH_CNP,        /* Cannon/Comet Lake PCH */
+       PCH_ICP,        /* Ice Lake/Jasper Lake PCH */
+       PCH_TGP,        /* Tiger Lake/Mule Creek Canyon PCH */
+       PCH_ADP,        /* Alder Lake PCH */
+       PCH_MTP,        /* Meteor Lake PCH */
+
+       /* Fake PCHs, functionality handled on the same PCI dev */
+       PCH_DG1 = 1024,
+       PCH_DG2,
+};
+
+#define INTEL_PCH_DEVICE_ID_MASK               0xff80
+#define INTEL_PCH_IBX_DEVICE_ID_TYPE           0x3b00
+#define INTEL_PCH_CPT_DEVICE_ID_TYPE           0x1c00
+#define INTEL_PCH_PPT_DEVICE_ID_TYPE           0x1e00
+#define INTEL_PCH_LPT_DEVICE_ID_TYPE           0x8c00
+#define INTEL_PCH_LPT_LP_DEVICE_ID_TYPE                0x9c00
+#define INTEL_PCH_WPT_DEVICE_ID_TYPE           0x8c80
+#define INTEL_PCH_WPT_LP_DEVICE_ID_TYPE                0x9c80
+#define INTEL_PCH_SPT_DEVICE_ID_TYPE           0xA100
+#define INTEL_PCH_SPT_LP_DEVICE_ID_TYPE                0x9D00
+#define INTEL_PCH_KBP_DEVICE_ID_TYPE           0xA280
+#define INTEL_PCH_CNP_DEVICE_ID_TYPE           0xA300
+#define INTEL_PCH_CNP_LP_DEVICE_ID_TYPE                0x9D80
+#define INTEL_PCH_CMP_DEVICE_ID_TYPE           0x0280
+#define INTEL_PCH_CMP2_DEVICE_ID_TYPE          0x0680
+#define INTEL_PCH_CMP_V_DEVICE_ID_TYPE         0xA380
+#define INTEL_PCH_ICP_DEVICE_ID_TYPE           0x3480
+#define INTEL_PCH_ICP2_DEVICE_ID_TYPE          0x3880
+#define INTEL_PCH_MCC_DEVICE_ID_TYPE           0x4B00
+#define INTEL_PCH_TGP_DEVICE_ID_TYPE           0xA080
+#define INTEL_PCH_TGP2_DEVICE_ID_TYPE          0x4380
+#define INTEL_PCH_JSP_DEVICE_ID_TYPE           0x4D80
+#define INTEL_PCH_ADP_DEVICE_ID_TYPE           0x7A80
+#define INTEL_PCH_ADP2_DEVICE_ID_TYPE          0x5180
+#define INTEL_PCH_ADP3_DEVICE_ID_TYPE          0x7A00
+#define INTEL_PCH_ADP4_DEVICE_ID_TYPE          0x5480
+#define INTEL_PCH_MTP_DEVICE_ID_TYPE           0x7E00
+#define INTEL_PCH_MTP2_DEVICE_ID_TYPE          0xAE00
+#define INTEL_PCH_P2X_DEVICE_ID_TYPE           0x7100
+#define INTEL_PCH_P3X_DEVICE_ID_TYPE           0x7000
+#define INTEL_PCH_QEMU_DEVICE_ID_TYPE          0x2900 /* qemu q35 has 2918 */
+
+#define INTEL_PCH_TYPE(dev_priv)               ((dev_priv)->pch_type)
+#define INTEL_PCH_ID(dev_priv)                 ((dev_priv)->pch_id)
+#define HAS_PCH_MTP(dev_priv)                  (INTEL_PCH_TYPE(dev_priv) == PCH_MTP)
+#define HAS_PCH_DG2(dev_priv)                  (INTEL_PCH_TYPE(dev_priv) == PCH_DG2)
+#define HAS_PCH_ADP(dev_priv)                  (INTEL_PCH_TYPE(dev_priv) == PCH_ADP)
+#define HAS_PCH_DG1(dev_priv)                  (INTEL_PCH_TYPE(dev_priv) == PCH_DG1)
+#define HAS_PCH_TGP(dev_priv)                  (INTEL_PCH_TYPE(dev_priv) == PCH_TGP)
+#define HAS_PCH_ICP(dev_priv)                  (INTEL_PCH_TYPE(dev_priv) == PCH_ICP)
+#define HAS_PCH_CNP(dev_priv)                  (INTEL_PCH_TYPE(dev_priv) == PCH_CNP)
+#define HAS_PCH_SPT(dev_priv)                  (INTEL_PCH_TYPE(dev_priv) == PCH_SPT)
+#define HAS_PCH_LPT(dev_priv)                  (INTEL_PCH_TYPE(dev_priv) == PCH_LPT)
+#define HAS_PCH_LPT_LP(dev_priv) \
+       (INTEL_PCH_ID(dev_priv) == INTEL_PCH_LPT_LP_DEVICE_ID_TYPE || \
+        INTEL_PCH_ID(dev_priv) == INTEL_PCH_WPT_LP_DEVICE_ID_TYPE)
+#define HAS_PCH_LPT_H(dev_priv) \
+       (INTEL_PCH_ID(dev_priv) == INTEL_PCH_LPT_DEVICE_ID_TYPE || \
+        INTEL_PCH_ID(dev_priv) == INTEL_PCH_WPT_DEVICE_ID_TYPE)
+#define HAS_PCH_CPT(dev_priv)                  (INTEL_PCH_TYPE(dev_priv) == PCH_CPT)
+#define HAS_PCH_IBX(dev_priv)                  (INTEL_PCH_TYPE(dev_priv) == PCH_IBX)
+#define HAS_PCH_NOP(dev_priv)                  (INTEL_PCH_TYPE(dev_priv) == PCH_NOP)
+#define HAS_PCH_SPLIT(dev_priv)                        (INTEL_PCH_TYPE(dev_priv) != PCH_NONE)
+
+void intel_detect_pch(struct drm_i915_private *dev_priv);
+
+#endif /* __INTEL_PCH__ */