drm/i915/bdw: support GMS and GGMS changes
All the BARs have the ability to grow. v2: Pulled out the simulator workaround to a separate patch. Rebased. v3: Rebase onto latest vlv patches from Jesse. v4: Rebased on top of the early stolen quirk patch from Jesse. v5: Use the new macro names. s/INTEL_BDW_PCI_IDS_D/INTEL_BDW_D_IDS s/INTEL_BDW_PCI_IDS_M/INTEL_BDW_M_IDS It's Jesse's fault for not following the convention I originally set. Cc: Ingo Molnar <mingo@kernel.org> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Ben Widawsky <ben@bwidawsk.net> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:

committed by
Daniel Vetter

parent
4e0bbc316e
commit
9459d25237
@@ -313,6 +313,16 @@ static size_t __init gen6_stolen_size(int num, int slot, int func)
|
||||
return gmch_ctrl << 25; /* 32 MB units */
|
||||
}
|
||||
|
||||
static inline size_t gen8_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;
|
||||
return gmch_ctrl << 25; /* 32 MB units */
|
||||
}
|
||||
|
||||
typedef size_t (*stolen_size_fn)(int num, int slot, int func);
|
||||
|
||||
static struct pci_device_id intel_stolen_ids[] __initdata = {
|
||||
@@ -336,6 +346,8 @@ static struct pci_device_id intel_stolen_ids[] __initdata = {
|
||||
INTEL_IVB_D_IDS(gen6_stolen_size),
|
||||
INTEL_HSW_D_IDS(gen6_stolen_size),
|
||||
INTEL_HSW_M_IDS(gen6_stolen_size),
|
||||
INTEL_BDW_M_IDS(gen8_stolen_size),
|
||||
INTEL_BDW_D_IDS(gen8_stolen_size)
|
||||
};
|
||||
|
||||
static void __init intel_graphics_stolen(int num, int slot, int func)
|
||||
|
Reference in New Issue
Block a user