early stolen mem detection
Subsystems (4)
This is getting ugly; looking for feedback.
PATCH 1/2 drm/i915: move PCI IDs to i915_drm.h
Since we need to use them in early x86 boot code.
Signed-off-by Jesse Barnes <[email protected]>
--- drivers/gpu/drm/i915/i915_drv.c | 158 ++++++---------------------------- include/drm/i915_drm.h | 180 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 208 insertions(+), 130 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +28 -130
@@ -140,25 +140,6 @@ MODULE_PARM_DESC(fastboot, "Try to skip unnecessary mode sets at boot time "static struct drm_driver driver;extern int intel_agp_enabled; -#define INTEL_VGA_DEVICE (id, info) { \ - .class = PCI_BASE_CLASS_DISPLAY << 16, \ - .class_mask = 0xff0000, \ - .vendor = 0x8086, \ - .device = id, \ - .subvendor = PCI_ANY_ID, \ - .subdevice = PCI_ANY_ID, \ - .driver_data = (unsigned long) info } - -#define INTEL_QUANTA_VGA_DEVICE (info) { \ - .class = PCI_BASE_CLASS_DISPLAY << 16, \ - .class_mask = 0xff0000, \ - .vendor = 0x8086, \ - .device = 0x16a, \ - .subvendor = 0x152d, \ - .subdevice = 0x8990, \ - .driver_data = (unsigned long) info } - -static const struct intel_device_info intel_i830_info = { .gen =2 , .is_mobile =1 , .cursor_needs_physical =1 , .num_pipes =2 , .has_overlay =1 , .overlay_needs_physical =1 ,
@@ -333,118 +314,35 @@ static const struct intel_device_info intel_haswell_m_info = { .has_vebox_ring = 1, }; +#define INTEL_PCI_IDS \ + INTEL_I830_IDS(&intel_i830_info), \ + INTEL_I845G_IDS(&intel_845g_info), \ + INTEL_I85X_IDS(&intel_i85x_info), \ + INTEL_I865G_IDS(&intel_i865g_info), \ + INTEL_I915G_IDS(&intel_i915g_info), \ + INTEL_I915GM_IDS(&intel_i915gm_info), \ + INTEL_I945G_IDS(&intel_i945g_info), \ + INTEL_I945GM_IDS(&intel_i945gm_info), \ + INTEL_I965G_IDS(&intel_i965g_info), \ + INTEL_G33_IDS(&intel_g33_info), \ + INTEL_I965GM_IDS(&intel_i965gm_info), \ + INTEL_GM45_IDS(&intel_gm45_info), \ + INTEL_G45_IDS(&intel_g45_info), \ + INTEL_PINEVIEW_IDS(&intel_pineview_info), \ + INTEL_IRONLAKE_D_IDS(&intel_ironlake_d_info), \ + INTEL_IRONLAKE_M_IDS(&intel_ironlake_m_info), \ + INTEL_SNB_D_IDS(&intel_sandybridge_d_info), \ + INTEL_SNB_M_IDS(&intel_sandybridge_m_info), \ + INTEL_IVB_M_IDS(&intel_ivybridge_m_info), \ + INTEL_IVB_D_IDS(&intel_ivybridge_d_info), \ + INTEL_IVB_Q_IDS(&intel_ivybridge_q_info), \ + INTEL_HSW_D_IDS(&intel_haswell_d_info), \ + INTEL_HSW_M_IDS(&intel_haswell_m_info), \ + INTEL_VLV_M_IDS(&intel_valleyview_m_info), \ + INTEL_VLV_D_IDS(&intel_valleyview_d_info) +static const struct pci_device_id pciidlist[] = {/* aka */ -INTEL_VGA_DEVICE (0x3577 , &intel_i830_info),/* I830_M */ -INTEL_VGA_DEVICE (0x2562 , &intel_845g_info),/* 845_G */ -INTEL_VGA_DEVICE (0x3582 , &intel_i85x_info),/* I855_GM */ -INTEL_VGA_DEVICE (0x358e , &intel_i85x_info), -INTEL_VGA_DEVICE (0x2572 , &intel_i865g_info),/* I865_G */ -INTEL_VGA_DEVICE (0x2582 , &intel_i915g_info),/* I915_G */ -INTEL_VGA_DEVICE (0x258a , &intel_i915g_info),/* E7221_G */ -INTEL_VGA_DEVICE (0x2592 , &intel_i915gm_info),/* I915_GM */ -INTEL_VGA_DEVICE (0x2772 , &intel_i945g_info),/* I945_G */ -INTEL_VGA_DEVICE (0x27a2 , &intel_i945gm_info),/* I945_GM */ -INTEL_VGA_DEVICE (0x27ae , &intel_i945gm_info),/* I945_GME */ -INTEL_VGA_DEVICE (0x2972 , &intel_i965g_info),/* I946_GZ */ -INTEL_VGA_DEVICE (0x2982 , &intel_i965g_info),/* G35_G */ -INTEL_VGA_DEVICE (0x2992 , &intel_i965g_info),/* I965_Q */ -INTEL_VGA_DEVICE (0x29a2 , &intel_i965g_info),/* I965_G */ -INTEL_VGA_DEVICE (0x29b2 , &intel_g33_info),/* Q35_G */ -INTEL_VGA_DEVICE (0x29c2 , &intel_g33_info),/* G33_G */ -INTEL_VGA_DEVICE (0x29d2 , &intel_g33_info),/* Q33_G */ -INTEL_VGA_DEVICE (0x2a02 , &intel_i965gm_info),/* I965_GM */ -INTEL_VGA_DEVICE (0x2a12 , &intel_i965gm_info),/* I965_GME */ -INTEL_VGA_DEVICE (0x2a42 , &intel_gm45_info),/* GM45_G */ -INTEL_VGA_DEVICE (0x2e02 , &intel_g45_info),/* IGD_E_G */ -INTEL_VGA_DEVICE (0x2e12 , &intel_g45_info),/* Q45_G */ -INTEL_VGA_DEVICE (0x2e22 , &intel_g45_info),/* G45_G */ -INTEL_VGA_DEVICE (0x2e32 , &intel_g45_info),/* G41_G */ -INTEL_VGA_DEVICE (0x2e42 , &intel_g45_info),/* B43_G */ -INTEL_VGA_DEVICE (0x2e92 , &intel_g45_info),/* B43_G.1 */ -INTEL_VGA_DEVICE (0xa001 , &intel_pineview_info), -INTEL_VGA_DEVICE (0xa011 , &intel_pineview_info), -INTEL_VGA_DEVICE (0x0042 , &intel_ironlake_d_info), -INTEL_VGA_DEVICE (0x0046 , &intel_ironlake_m_info), -INTEL_VGA_DEVICE (0x0102 , &intel_sandybridge_d_info), -INTEL_VGA_DEVICE (0x0112 , &intel_sandybridge_d_info), -INTEL_VGA_DEVICE (0x0122 , &intel_sandybridge_d_info), -INTEL_VGA_DEVICE (0x0106 , &intel_sandybridge_m_info), -INTEL_VGA_DEVICE (0x0116 , &intel_sandybridge_m_info), -INTEL_VGA_DEVICE (0x0126 , &intel_sandybridge_m_info), -INTEL_VGA_DEVICE (0x010A , &intel_sandybridge_d_info), -INTEL_VGA_DEVICE (0x0156 , &intel_ivybridge_m_info),/* GT1 mobile */ -INTEL_VGA_DEVICE (0x0166 , &intel_ivybridge_m_info),/* GT2 mobile */ -INTEL_VGA_DEVICE (0x0152 , &intel_ivybridge_d_info),/* GT1 desktop */ -INTEL_VGA_DEVICE (0x0162 , &intel_ivybridge_d_info),/* GT2 desktop */ -INTEL_VGA_DEVICE (0x015a , &intel_ivybridge_d_info),/* GT1 server */ -INTEL_QUANTA_VGA_DEVICE (&intel_ivybridge_q_info),/* Quanta transcode */ -INTEL_VGA_DEVICE (0x016a , &intel_ivybridge_d_info),/* GT2 server */ -INTEL_VGA_DEVICE (0x0402 , &intel_haswell_d_info),/* GT1 desktop */ -INTEL_VGA_DEVICE (0x0412 , &intel_haswell_d_info),/* GT2 desktop */ -INTEL_VGA_DEVICE (0x0422 , &intel_haswell_d_info),/* GT3 desktop */ -INTEL_VGA_DEVICE (0x040a , &intel_haswell_d_info),/* GT1 server */ -INTEL_VGA_DEVICE (0x041a , &intel_haswell_d_info),/* GT2 server */ -INTEL_VGA_DEVICE (0x042a , &intel_haswell_d_info),/* GT3 server */ -INTEL_VGA_DEVICE (0x0406 , &intel_haswell_m_info),/* GT1 mobile */ -INTEL_VGA_DEVICE (0x0416 , &intel_haswell_m_info),/* GT2 mobile */ -INTEL_VGA_DEVICE (0x0426 , &intel_haswell_m_info),/* GT2 mobile */ -INTEL_VGA_DEVICE (0x040B , &intel_haswell_d_info),/* GT1 reserved */ -INTEL_VGA_DEVICE (0x041B , &intel_haswell_d_info),/* GT2 reserved */ -INTEL_VGA_DEVICE (0x042B , &intel_haswell_d_info),/* GT3 reserved */ -INTEL_VGA_DEVICE (0x040E , &intel_haswell_d_info),/* GT1 reserved */ -INTEL_VGA_DEVICE (0x041E , &intel_haswell_d_info),/* GT2 reserved */ -INTEL_VGA_DEVICE (0x042E , &intel_haswell_d_info),/* GT3 reserved */ -INTEL_VGA_DEVICE (0x0C02 , &intel_haswell_d_info),/* SDV GT1 desktop */ -INTEL_VGA_DEVICE (0x0C12 , &intel_haswell_d_info),/* SDV GT2 desktop */ -INTEL_VGA_DEVICE (0x0C22 , &intel_haswell_d_info),/* SDV GT3 desktop */ -INTEL_VGA_DEVICE (0x0C0A , &intel_haswell_d_info),/* SDV GT1 server */ -INTEL_VGA_DEVICE (0x0C1A , &intel_haswell_d_info),/* SDV GT2 server */ -INTEL_VGA_DEVICE (0x0C2A , &intel_haswell_d_info),/* SDV GT3 server */ -INTEL_VGA_DEVICE (0x0C06 , &intel_haswell_m_info),/* SDV GT1 mobile */ -INTEL_VGA_DEVICE (0x0C16 , &intel_haswell_m_info),/* SDV GT2 mobile */ -INTEL_VGA_DEVICE (0x0C26 , &intel_haswell_m_info),/* SDV GT3 mobile */ -INTEL_VGA_DEVICE (0x0C0B , &intel_haswell_d_info),/* SDV GT1 reserved */ -INTEL_VGA_DEVICE (0x0C1B , &intel_haswell_d_info),/* SDV GT2 reserved */ -INTEL_VGA_DEVICE (0x0C2B , &intel_haswell_d_info),/* SDV GT3 reserved */ -INTEL_VGA_DEVICE (0x0C0E , &intel_haswell_d_info),/* SDV GT1 reserved */ -INTEL_VGA_DEVICE (0x0C1E , &intel_haswell_d_info),/* SDV GT2 reserved */ -INTEL_VGA_DEVICE (0x0C2E , &intel_haswell_d_info),/* SDV GT3 reserved */ -INTEL_VGA_DEVICE (0x0A02 , &intel_haswell_d_info),/* ULT GT1 desktop */ -INTEL_VGA_DEVICE (0x0A12 , &intel_haswell_d_info),/* ULT GT2 desktop */ -INTEL_VGA_DEVICE (0x0A22 , &intel_haswell_d_info),/* ULT GT3 desktop */ -INTEL_VGA_DEVICE (0x0A0A , &intel_haswell_d_info),/* ULT GT1 server */ -INTEL_VGA_DEVICE (0x0A1A , &intel_haswell_d_info),/* ULT GT2 server */ -INTEL_VGA_DEVICE (0x0A2A , &intel_haswell_d_info),/* ULT GT3 server */ -INTEL_VGA_DEVICE (0x0A06 , &intel_haswell_m_info),/* ULT GT1 mobile */ -INTEL_VGA_DEVICE (0x0A16 , &intel_haswell_m_info),/* ULT GT2 mobile */ -INTEL_VGA_DEVICE (0x0A26 , &intel_haswell_m_info),/* ULT GT3 mobile */ -INTEL_VGA_DEVICE (0x0A0B , &intel_haswell_d_info),/* ULT GT1 reserved */ -INTEL_VGA_DEVICE (0x0A1B , &intel_haswell_d_info),/* ULT GT2 reserved */ -INTEL_VGA_DEVICE (0x0A2B , &intel_haswell_d_info),/* ULT GT3 reserved */ -INTEL_VGA_DEVICE (0x0A0E , &intel_haswell_m_info),/* ULT GT1 reserved */ -INTEL_VGA_DEVICE (0x0A1E , &intel_haswell_m_info),/* ULT GT2 reserved */ -INTEL_VGA_DEVICE (0x0A2E , &intel_haswell_m_info),/* ULT GT3 reserved */ -INTEL_VGA_DEVICE (0x0D02 , &intel_haswell_d_info),/* CRW GT1 desktop */ -INTEL_VGA_DEVICE (0x0D12 , &intel_haswell_d_info),/* CRW GT2 desktop */ -INTEL_VGA_DEVICE (0x0D22 , &intel_haswell_d_info),/* CRW GT3 desktop */ -INTEL_VGA_DEVICE (0x0D0A , &intel_haswell_d_info),/* CRW GT1 server */ -INTEL_VGA_DEVICE (0x0D1A , &intel_haswell_d_info),/* CRW GT2 server */ -INTEL_VGA_DEVICE (0x0D2A , &intel_haswell_d_info),/* CRW GT3 server */ -INTEL_VGA_DEVICE (0x0D06 , &intel_haswell_m_info),/* CRW GT1 mobile */ -INTEL_VGA_DEVICE (0x0D16 , &intel_haswell_m_info),/* CRW GT2 mobile */ -INTEL_VGA_DEVICE (0x0D26 , &intel_haswell_m_info),/* CRW GT3 mobile */ -INTEL_VGA_DEVICE (0x0D0B , &intel_haswell_d_info),/* CRW GT1 reserved */ -INTEL_VGA_DEVICE (0x0D1B , &intel_haswell_d_info),/* CRW GT2 reserved */ -INTEL_VGA_DEVICE (0x0D2B , &intel_haswell_d_info),/* CRW GT3 reserved */ -INTEL_VGA_DEVICE (0x0D0E , &intel_haswell_d_info),/* CRW GT1 reserved */ -INTEL_VGA_DEVICE (0x0D1E , &intel_haswell_d_info),/* CRW GT2 reserved */ -INTEL_VGA_DEVICE (0x0D2E , &intel_haswell_d_info),/* CRW GT3 reserved */ -INTEL_VGA_DEVICE (0x0f30 , &intel_valleyview_m_info), -INTEL_VGA_DEVICE (0x0f31 , &intel_valleyview_m_info), -INTEL_VGA_DEVICE (0x0f32 , &intel_valleyview_m_info), -INTEL_VGA_DEVICE (0x0f33 , &intel_valleyview_m_info), -INTEL_VGA_DEVICE (0x0157 , &intel_valleyview_m_info), -INTEL_VGA_DEVICE (0x0155 , &intel_valleyview_d_info), +INTEL_PCI_IDS , {0 ,0 ,0 } };
include/drm/i915_drm.h +180 -0
184 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 2/2 x86 early quirk: detect & reserve graphics stolen memory for Intel devices
In reply to Jesse BarnesWe need to do this early on before the E820 map is modified or conflicting resources assigned on top.
--- arch/x86/kernel/early-quirks.c | 91 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+)
arch/x86/kernel/early-quirks.c +91 -0
@@ -208,6 +208,95 @@ static void __init intel_remapping_check(int num, int slot, int func) } +static const struct pci_device_id gen3_method_ids[] = { +INTEL_I830_IDS (NULL ), +INTEL_I845G_IDS (NULL ), +INTEL_I85X_IDS (NULL ), +INTEL_I865G_IDS (NULL ), +INTEL_I915G_IDS (NULL ), +INTEL_I915GM_IDS (NULL ), +INTEL_I945G_IDS (NULL ), +INTEL_I945GM_IDS (NULL ), +INTEL_VLV_M_IDS (NULL ), +INTEL_VLV_D_IDS (NULL ), +INTEL_PINEVIEW_IDS (NULL ), +}; +static const struct pci_device_id gen4_method_ids[] = { +INTEL_I965G_IDS (NULL ), +INTEL_G33_IDS (NULL ), +INTEL_I965GM_IDS (NULL ), +INTEL_GM45_IDS (NULL ), +INTEL_G45_IDS (NULL ), +INTEL_IRONLAKE_D_IDS (NULL ), +INTEL_IRONLAKE_M_IDS (NULL ), +}; +static const struct pci_device_id gen6_method_ids[] = { +INTEL_SNB_D_IDS (NULL ), +INTEL_SNB_M_IDS (NULL ), +INTEL_IVB_M_IDS (NULL ), +INTEL_IVB_D_IDS (NULL ), +INTEL_IVB_Q_IDS (NULL ), +INTEL_HSW_D_IDS (NULL ), +INTEL_HSW_M_IDS (NULL ), +}; + +static void __init intel_gen3_method (int num,int slot,int func, +u32 *start,size_t *size) +{ +} + +static void __init intel_gen4_method (int num,int slot,int func, +u32 *start,size_t *size) +{ +} + +static void __init intel_gen6_method (int num,int slot,int func, +u32 *start,size_t *size) +{ +} + +static void __init intel_graphics_stolen (int num,int slot,int func) +{ +size_t size; +int i; +u32 start; +u16 device, subvendor, subdevice; + + device =read_pci_config_word (num, slot, func,PCI_DEVICE_ID ); + subvendor =read_pci_config_word (num, slot, func,PCI_SUBVENDOR_ID ); + subdevice =read_pci_config_word (num, slot, func,PCI_SUBDEVICE_ID ); + +for (i =0 ; i <ARRAY_SIZE (gen3_method_ids); i++) { +if (gen3_method_ids[i].device == device) { +intel_gen3_method (num, slot, func, &start, &size); + goto found; + } + } + +for (i =0 ; i <ARRAY_SIZE (gen4_method_ids); i++) { +if (gen4_method_ids[i].device == device) { +intel_gen4_method (num, slot, func, &start, &size); + goto found; + } + } + +for (i =0 ; i <ARRAY_SIZE (gen6_method_ids); i++) { +if (gen6_method_ids[i].device == device && + (gen6_method_ids[i].subvendor ==PCI_ANY_ID || + gen6_method_ids[i].subvendor == subvendor) && + (gen6_method_ids[i].subdevice ==PCI_ANY_ID || + gen6_method_ids[i].subdevce == subdevice)) { +intel_gen6_method (num, slot, func, &start, &size); + goto found; + } + } + +/* No match, don't bother reserving */ +return ; +found: + /* Mark this space as reserved */ +} +#define QFLAG_APPLY_ONCE 0x1#define QFLAG_APPLIED 0x2#define QFLAG_DONE (QFLAG_APPLY_ONCE|QFLAG_APPLIED)
@@ -241,6 +330,8 @@ static struct chipset early_qrk[] __initdata = { PCI_BASE_CLASS_BRIDGE, 0, intel_remapping_check }, {PCI_VENDOR_ID_INTEL ,0x3406 ,PCI_CLASS_BRIDGE_HOST , PCI_BASE_CLASS_BRIDGE, 0, intel_remapping_check }, + { PCI_VENDOR_ID_INTEL, PCI_ANY_ID, PCI_CLASS_DISPLAY, PCI_ANY_ID, + QFLAG_APPLY_ONCE, intel_graphics_stolen } {} };
Signature · 1 line
1.7.9.5