Commit 66375014 authored by Damien Lespiau's avatar Damien Lespiau Committed by Daniel Vetter
Browse files

drm/i915/skl: Add the additional graphics stolen sizes 



Skylake introduces new stolen memory sizes starting at 0xf0 (4MB) and
growing by 4MB increments from there.

v2: Rebase on top of the early-quirk changes from Ville.

v3: Rebase on top of the PCI_IDS/IDS macro rename

Reviewed-by: default avatarThomas Wood <thomas.wood@intel.com>
Signed-off-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 1b1aad75

arch/x86/kernel/early-quirks.c

+23 −0
Original line number Diff line number Diff line
@@ -455,6 +455,23 @@ struct intel_stolen_funcs { 
	u32 (*base)(int num, int slot, int func, size_t size);

};



static size_t __init gen9_stolen_size(int num, int slot, int func)

{

	u16 gmch_ctrl;



	gmch_ctrl = read_pci_config_16(num, slot, func, SNB_GMCH_CTRL);

	gmch_ctrl >>= BDW_GMCH_GMS_SHIFT;

	gmch_ctrl &= BDW_GMCH_GMS_MASK;



	if (gmch_ctrl < 0xf0)

		return gmch_ctrl << 25; /* 32 MB units */

	else

		/* 4MB increments starting at 0xf0 for 4MB */

		return (gmch_ctrl - 0xf0 + 1) << 22;

}



typedef size_t (*stolen_size_fn)(int num, int slot, int func);



static const struct intel_stolen_funcs i830_stolen_funcs __initconst = {

	.base = i830_stolen_base,

	.size = i830_stolen_size,
@@ -490,6 +507,11 @@ static const struct intel_stolen_funcs gen8_stolen_funcs __initconst = { 
	.size = gen8_stolen_size,

};



static const struct intel_stolen_funcs gen9_stolen_funcs __initconst = {

	.base = intel_stolen_base,

	.size = gen9_stolen_size,

};



static const struct intel_stolen_funcs chv_stolen_funcs __initconst = {

	.base = intel_stolen_base,

	.size = chv_stolen_size,
@@ -523,6 +545,7 @@ static const struct pci_device_id intel_stolen_ids[] __initconst = { 
	INTEL_BDW_M_IDS(&gen8_stolen_funcs),

	INTEL_BDW_D_IDS(&gen8_stolen_funcs),

	INTEL_CHV_IDS(&chv_stolen_funcs),

	INTEL_SKL_IDS(&gen9_stolen_funcs),

};



static void __init intel_graphics_stolen(int num, int slot, int func)

drivers/gpu/drm/i915/i915_gem_gtt.c

+16 −1
Original line number Diff line number Diff line
@@ -1847,6 +1847,18 @@ static size_t chv_get_stolen_size(u16 gmch_ctrl) 
		return (gmch_ctrl - 0x17 + 9) << 22;

}



static size_t gen9_get_stolen_size(u16 gen9_gmch_ctl)

{

	gen9_gmch_ctl >>= BDW_GMCH_GMS_SHIFT;

	gen9_gmch_ctl &= BDW_GMCH_GMS_MASK;



	if (gen9_gmch_ctl < 0xf0)

		return gen9_gmch_ctl << 25; /* 32 MB units */

	else

		/* 4MB increments starting at 0xf0 for 4MB */

		return (gen9_gmch_ctl - 0xf0 + 1) << 22;

}



static int ggtt_probe_common(struct drm_device *dev,

			     size_t gtt_size)

{
@@ -1943,7 +1955,10 @@ static int gen8_gmch_probe(struct drm_device *dev, 


	pci_read_config_word(dev->pdev, SNB_GMCH_CTRL, &snb_gmch_ctl);



	if (IS_CHERRYVIEW(dev)) {

	if (INTEL_INFO(dev)->gen >= 9) {

		*stolen = gen9_get_stolen_size(snb_gmch_ctl);

		gtt_size = gen8_get_total_gtt_size(snb_gmch_ctl);

	} else if (IS_CHERRYVIEW(dev)) {

		*stolen = chv_get_stolen_size(snb_gmch_ctl);

		gtt_size = chv_get_total_gtt_size(snb_gmch_ctl);

	} else {

CRA Git | Maintained and supported by SUSTech CRA and CCSE