Skip to content

Commit b185a35

Browse files
committed
drm/i915: Read out memory type
We'll need to know the memory type in the system for some bandwidth limitations and whatnot. Let's read that out on gen9+. v2: Rebase v3: Fix the copy paste fail in the BXT bit definitions (Jani) Reviewed-by: Jani Nikula <[email protected]> Signed-off-by: Ville Syrjälä <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 6d9c1e9 commit b185a35

File tree

3 files changed

+100
-4
lines changed

3 files changed

+100
-4
lines changed

drivers/gpu/drm/i915/i915_drv.c

Lines changed: 80 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,6 +1068,26 @@ static void intel_sanitize_options(struct drm_i915_private *dev_priv)
10681068
intel_gvt_sanitize_options(dev_priv);
10691069
}
10701070

1071+
#define DRAM_TYPE_STR(type) [INTEL_DRAM_ ## type] = #type
1072+
1073+
static const char *intel_dram_type_str(enum intel_dram_type type)
1074+
{
1075+
static const char * const str[] = {
1076+
DRAM_TYPE_STR(UNKNOWN),
1077+
DRAM_TYPE_STR(DDR3),
1078+
DRAM_TYPE_STR(DDR4),
1079+
DRAM_TYPE_STR(LPDDR3),
1080+
DRAM_TYPE_STR(LPDDR4),
1081+
};
1082+
1083+
if (type >= ARRAY_SIZE(str))
1084+
type = INTEL_DRAM_UNKNOWN;
1085+
1086+
return str[type];
1087+
}
1088+
1089+
#undef DRAM_TYPE_STR
1090+
10711091
static int intel_dimm_num_devices(const struct dram_dimm_info *dimm)
10721092
{
10731093
return dimm->ranks * 64 / (dimm->width ?: 1);
@@ -1254,13 +1274,38 @@ skl_dram_get_channels_info(struct drm_i915_private *dev_priv)
12541274
return 0;
12551275
}
12561276

1277+
static enum intel_dram_type
1278+
skl_get_dram_type(struct drm_i915_private *dev_priv)
1279+
{
1280+
u32 val;
1281+
1282+
val = I915_READ(SKL_MAD_INTER_CHANNEL_0_0_0_MCHBAR_MCMAIN);
1283+
1284+
switch (val & SKL_DRAM_DDR_TYPE_MASK) {
1285+
case SKL_DRAM_DDR_TYPE_DDR3:
1286+
return INTEL_DRAM_DDR3;
1287+
case SKL_DRAM_DDR_TYPE_DDR4:
1288+
return INTEL_DRAM_DDR4;
1289+
case SKL_DRAM_DDR_TYPE_LPDDR3:
1290+
return INTEL_DRAM_LPDDR3;
1291+
case SKL_DRAM_DDR_TYPE_LPDDR4:
1292+
return INTEL_DRAM_LPDDR4;
1293+
default:
1294+
MISSING_CASE(val);
1295+
return INTEL_DRAM_UNKNOWN;
1296+
}
1297+
}
1298+
12571299
static int
12581300
skl_get_dram_info(struct drm_i915_private *dev_priv)
12591301
{
12601302
struct dram_info *dram_info = &dev_priv->dram_info;
12611303
u32 mem_freq_khz, val;
12621304
int ret;
12631305

1306+
dram_info->type = skl_get_dram_type(dev_priv);
1307+
DRM_DEBUG_KMS("DRAM type: %s\n", intel_dram_type_str(dram_info->type));
1308+
12641309
ret = skl_dram_get_channels_info(dev_priv);
12651310
if (ret)
12661311
return ret;
@@ -1327,6 +1372,26 @@ static int bxt_get_dimm_ranks(u32 val)
13271372
}
13281373
}
13291374

1375+
static enum intel_dram_type bxt_get_dimm_type(u32 val)
1376+
{
1377+
if (!bxt_get_dimm_size(val))
1378+
return INTEL_DRAM_UNKNOWN;
1379+
1380+
switch (val & BXT_DRAM_TYPE_MASK) {
1381+
case BXT_DRAM_TYPE_DDR3:
1382+
return INTEL_DRAM_DDR3;
1383+
case BXT_DRAM_TYPE_LPDDR3:
1384+
return INTEL_DRAM_LPDDR3;
1385+
case BXT_DRAM_TYPE_DDR4:
1386+
return INTEL_DRAM_DDR4;
1387+
case BXT_DRAM_TYPE_LPDDR4:
1388+
return INTEL_DRAM_LPDDR4;
1389+
default:
1390+
MISSING_CASE(val);
1391+
return INTEL_DRAM_UNKNOWN;
1392+
}
1393+
}
1394+
13301395
static void bxt_get_dimm_info(struct dram_dimm_info *dimm,
13311396
u32 val)
13321397
{
@@ -1369,6 +1434,7 @@ bxt_get_dram_info(struct drm_i915_private *dev_priv)
13691434
*/
13701435
for (i = BXT_D_CR_DRP0_DUNIT_START; i <= BXT_D_CR_DRP0_DUNIT_END; i++) {
13711436
struct dram_dimm_info dimm;
1437+
enum intel_dram_type type;
13721438

13731439
val = I915_READ(BXT_D_CR_DRP0_DUNIT(i));
13741440
if (val == 0xFFFFFFFF)
@@ -1377,10 +1443,16 @@ bxt_get_dram_info(struct drm_i915_private *dev_priv)
13771443
dram_info->num_channels++;
13781444

13791445
bxt_get_dimm_info(&dimm, val);
1446+
type = bxt_get_dimm_type(val);
1447+
1448+
WARN_ON(type != INTEL_DRAM_UNKNOWN &&
1449+
dram_info->type != INTEL_DRAM_UNKNOWN &&
1450+
dram_info->type != type);
13801451

1381-
DRM_DEBUG_KMS("CH%u DIMM size: %u GB, width: X%u, ranks: %u\n",
1452+
DRM_DEBUG_KMS("CH%u DIMM size: %u GB, width: X%u, ranks: %u, type: %s\n",
13821453
i - BXT_D_CR_DRP0_DUNIT_START,
1383-
dimm.size, dimm.width, dimm.ranks);
1454+
dimm.size, dimm.width, dimm.ranks,
1455+
intel_dram_type_str(type));
13841456

13851457
/*
13861458
* If any of the channel is single rank channel,
@@ -1391,10 +1463,14 @@ bxt_get_dram_info(struct drm_i915_private *dev_priv)
13911463
dram_info->ranks = dimm.ranks;
13921464
else if (dimm.ranks == 1)
13931465
dram_info->ranks = 1;
1466+
1467+
if (type != INTEL_DRAM_UNKNOWN)
1468+
dram_info->type = type;
13941469
}
13951470

1396-
if (dram_info->ranks == 0) {
1397-
DRM_INFO("couldn't get memory rank information\n");
1471+
if (dram_info->type == INTEL_DRAM_UNKNOWN ||
1472+
dram_info->ranks == 0) {
1473+
DRM_INFO("couldn't get memory information\n");
13981474
return -EINVAL;
13991475
}
14001476

drivers/gpu/drm/i915/i915_drv.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1829,6 +1829,13 @@ struct drm_i915_private {
18291829
u8 ranks;
18301830
u32 bandwidth_kbps;
18311831
bool symmetric_memory;
1832+
enum intel_dram_type {
1833+
INTEL_DRAM_UNKNOWN,
1834+
INTEL_DRAM_DDR3,
1835+
INTEL_DRAM_DDR4,
1836+
INTEL_DRAM_LPDDR3,
1837+
INTEL_DRAM_LPDDR4
1838+
} type;
18321839
} dram_info;
18331840

18341841
struct i915_runtime_pm runtime_pm;

drivers/gpu/drm/i915/i915_reg.h

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9861,11 +9861,24 @@ enum skl_power_gate {
98619861
#define BXT_DRAM_SIZE_8GBIT (0x2 << 6)
98629862
#define BXT_DRAM_SIZE_12GBIT (0x3 << 6)
98639863
#define BXT_DRAM_SIZE_16GBIT (0x4 << 6)
9864+
#define BXT_DRAM_TYPE_MASK (0x7 << 22)
9865+
#define BXT_DRAM_TYPE_SHIFT 22
9866+
#define BXT_DRAM_TYPE_DDR3 (0x0 << 22)
9867+
#define BXT_DRAM_TYPE_LPDDR3 (0x1 << 22)
9868+
#define BXT_DRAM_TYPE_LPDDR4 (0x2 << 22)
9869+
#define BXT_DRAM_TYPE_DDR4 (0x4 << 22)
98649870

98659871
#define SKL_MEMORY_FREQ_MULTIPLIER_HZ 266666666
98669872
#define SKL_MC_BIOS_DATA_0_0_0_MCHBAR_PCU _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5E04)
98679873
#define SKL_REQ_DATA_MASK (0xF << 0)
98689874

9875+
#define SKL_MAD_INTER_CHANNEL_0_0_0_MCHBAR_MCMAIN _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5000)
9876+
#define SKL_DRAM_DDR_TYPE_MASK (0x3 << 0)
9877+
#define SKL_DRAM_DDR_TYPE_DDR4 (0 << 0)
9878+
#define SKL_DRAM_DDR_TYPE_DDR3 (1 << 0)
9879+
#define SKL_DRAM_DDR_TYPE_LPDDR3 (2 << 0)
9880+
#define SKL_DRAM_DDR_TYPE_LPDDR4 (3 << 0)
9881+
98699882
#define SKL_MAD_DIMM_CH0_0_0_0_MCHBAR_MCMAIN _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x500C)
98709883
#define SKL_MAD_DIMM_CH1_0_0_0_MCHBAR_MCMAIN _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5010)
98719884
#define SKL_DRAM_S_SHIFT 16

0 commit comments

Comments
 (0)