drm/i915: split PCI IDs out into i915_drm.h
Subsystems (4)
PATCH 1/2 drm/i915: split PCI IDs out into i915_drm.h
For use by userspace (at some point in the future) and other kernel code.
--- 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: add early quirk for reserving Intel graphics stolen memory
Systems with Intel graphics controllers set aside memory exclusively for gfx driver use. This memory is not marked in the E820 as reserved or as RAM, and so is subject to overlap from E820 manipulation later in the boot process. On some systems, MMIO space is allocated on top, despite the efforts of the "RAM buffer" approach, which simply rounds memory boundaries up to 64M to try to catch space that may decode as RAM and so is not suitable for MMIO.
--- arch/x86/include/asm/pci-direct.h | 1 + arch/x86/kernel/early-quirks.c | 150 +++++++++++++++++++++++++++++++++++++ arch/x86/pci/early.c | 8 ++ include/drm/i915_drm.h | 18 +++++ 4 files changed, 177 insertions(+)
arch/x86/include/asm/pci-direct.h +1 -0
@@ -9,6 +9,7 @@extern u32 read_pci_config (u8 bus,u8 slot,u8 func,u8 offset);extern u8 read_pci_config_byte (u8 bus,u8 slot,u8 func,u8 offset);extern u16 read_pci_config_16 (u8 bus,u8 slot,u8 func,u8 offset); +extern u32 read_pci_config_32 (u8 bus,u8 slot,u8 func,u8 offset);extern void write_pci_config (u8 bus,u8 slot,u8 func,u8 offset,u32 val);extern void write_pci_config_byte (u8 bus,u8 slot,u8 func,u8 offset,u8 val);extern void write_pci_config_16 (u8 bus,u8 slot,u8 func,u8 offset,u16 val);
arch/x86/kernel/early-quirks.c +150 -0
168 lines not on this page · raw message
arch/x86/pci/early.c +8 -0
@@ -31,6 +31,14 @@ u16 read_pci_config_16(u8 bus, u8 slot, u8 func, u8 offset)return v; } +u32 read_pci_config_32 (u8 bus,u8 slot,u8 func,u8 offset) +{ +u32 v; +outl (0x80000000 | (bus<<16 ) | (slot<<11 ) | (func<<8 ) | offset,0xcf8 ); + v =inl (0xcfc ); +return v; +} +void write_pci_config (u8 bus,u8 slot,u8 func,u8 offset,u32 val) {
include/drm/i915_drm.h +18 -0
@@ -35,6 +35,24 @@ extern bool i915_gpu_lower(void);extern bool i915_gpu_busy (void );extern bool i915_gpu_turbo_disable (void ); +#define I830_GMCH_CTRL 0x52 + +#define I855_GMCH_GMS_MASK 0xF0 +#define I855_GMCH_GMS_STOLEN_0M 0x0 +#define I855_GMCH_GMS_STOLEN_1M (0x1 << 4) +#define I855_GMCH_GMS_STOLEN_4M (0x2 << 4) +#define I855_GMCH_GMS_STOLEN_8M (0x3 << 4) +#define I855_GMCH_GMS_STOLEN_16M (0x4 << 4) +#define I855_GMCH_GMS_STOLEN_32M (0x5 << 4) +#define I915_GMCH_GMS_STOLEN_48M (0x6 << 4) +#define I915_GMCH_GMS_STOLEN_64M (0x7 << 4) +#define G33_GMCH_GMS_STOLEN_128M (0x8 << 4) +#define G33_GMCH_GMS_STOLEN_256M (0x9 << 4) +#define INTEL_GMCH_GMS_STOLEN_96M (0xa << 4) +#define INTEL_GMCH_GMS_STOLEN_160M (0xb << 4) +#define INTEL_GMCH_GMS_STOLEN_224M (0xc << 4) +#define INTEL_GMCH_GMS_STOLEN_352M (0xd << 4) +#define INTEL_VGA_DEVICE (id, info) { \ .class = PCI_BASE_CLASS_DISPLAY << 16, \ .class_mask = 0xff0000, \
Signature · 1 line
1.7.9.5
Re: [PATCH 2/2] x86: add early quirk for reserving Intel graphics stolen memory
Quoted 45 lines · Jesse Barnes
Systems with Intel graphics controllers set aside memory exclusively for gfx driver use. This memory is not marked in the E820 as reserved or as RAM, and so is subject to overlap from E820 manipulation later in the boot process. On some systems, MMIO space is allocated on top, despite the efforts of the "RAM buffer" approach, which simply rounds memory boundaries up to 64M to try to catch space that may decode as RAM and so is not suitable for MMIO.
Signed-off-by Jesse Barnes <[email protected]>--- arch/x86/include/asm/pci-direct.h | 1 + arch/x86/kernel/early-quirks.c | 150 +++++++++++++++++++++++++++++++++++++ arch/x86/pci/early.c | 8 ++ include/drm/i915_drm.h | 18 +++++ 4 files changed, 177 insertions(+)arch/x86/include/asm/pci-direct.h +1
-0@@ -9,6 +9,7 @@extern u32 read_pci_config (u8 bus,u8 slot,u8 func,u8 offset);extern u8 read_pci_config_byte (u8 bus,u8 slot,u8 func,u8 offset);extern u16 read_pci_config_16 (u8 bus,u8 slot,u8 func,u8 offset); +extern u32 read_pci_config_32 (u8 bus,u8 slot,u8 func,u8 offset);extern void write_pci_config (u8 bus,u8 slot,u8 func,u8 offset,u32 val);extern void write_pci_config_byte (u8 bus,u8 slot,u8 func,u8 offset,u8 val);extern void write_pci_config_16 (u8 bus,u8 slot,u8 func,u8 offset,u16 val);arch/x86/kernel/early-quirks.c +2
-0@@ -12,6 +12,7 @@#include <linux/pci.h> #include <linux/acpi.h> #include <linux/pci_ids.h> +#include <drm/i915_drm.h> #include <asm/pci-direct.h> #include <asm/dma.h> #include <asm/io_apic.h> @@ -208,6 +209,153 @@ static void __init intel_remapping_check(int num, int slot, int func) } +/*
arch/x86/kernel/early-quirks.c static void __init intel_remapping_check(int num, int slot, int func) · line 222
Quoted 10 lines
arch/x86/kernel/early-quirks.c +10
-0+* Systems with Intel graphics controllers set aside memory exclusively +* for gfx driver use. This memory is not marked in the E820 as reserved +* or as RAM, and so is subject to overlap from E820 manipulation later +* in the boot process. On some systems, MMIO space is allocated on top, +* despite the efforts of the "RAM buffer" approach, which simply rounds +* memory boundaries up to 64M to try to catch space that may decode +* as RAM and so is not suitable for MMIO. +* +* And yes, so far on current devices the base addr is always under 4G. +*/
And for the indefinite future.
arch/x86/kernel/early-quirks.c static void __init intel_remapping_check(int num, int slot, int func) · line 234
Quoted 12 lines
arch/x86/kernel/early-quirks.c +12
-0+static u32 __init intel_stolen_base (int num,int slot,int func) +{ +u32 base; + +/* +* Almost universally we can find the Graphics Base of Stolen Memory +* at offset 0x5c in the igfx configuration space. On a few (desktop) +* machines this is also mirrored in the bridge device at different +* locations, or in the MCHBAR. +*/ + base =read_pci_config_32 (num, slot, func,0x5c ); + base &= ~((1 <<20 ) -1 );
I wish there was some synatic sugar we can apply for base &= -MB(1);
arch/x86/kernel/early-quirks.c static void __init intel_remapping_check(int num, int slot, int func) · line 243
Quoted 9 lines
arch/x86/kernel/early-quirks.c +9
-0+ +return base; +} + +#define KB (x) ((x) * 1024) +#define MB (x) (KB (KB (x))) +#define GB (x) (MB (KB (x))) + +static size_t __init intel_stolen_size (int num,int slot,int func)
SNB+ has a different defintion. (And IVB has multiple definitions in the bspec, but we've found the SNB one works best...)
arch/x86/kernel/early-quirks.c static void __init intel_remapping_check(int num, int slot, int func) · line 298
Quoted 1 line
arch/x86/kernel/early-quirks.c +1
-0+static struct pci_device_id intel_stolen_ids[]__initdata = {
const? Or is initdata already applying that fixup?
Quoted 9 lines
arch/x86/kernel/early-quirks.c +9
-0+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_16 (num, slot, func,PCI_DEVICE_ID ); + subvendor = read_pci_config_16(num, slot, func,
arch/x86/kernel/early-quirks.c static void __init intel_remapping_check(int num, int slot, int func) · line 342
Quoted 10 lines
arch/x86/kernel/early-quirks.c +10
-0+ PCI_SUBSYSTEM_VENDOR_ID); + subdevice =read_pci_config_16 (num, slot, func,PCI_SUBSYSTEM_ID ); + +for (i =0 ; i <ARRAY_SIZE (intel_stolen_ids); i++) { +if (intel_stolen_ids[i].device == device && + (intel_stolen_ids[i].subvendor ==PCI_ANY_ID || + intel_stolen_ids[i].subvendor == subvendor) && + (intel_stolen_ids[i].subdevice ==PCI_ANY_ID || + intel_stolen_ids[i].subdevice == subdevice)) { + size =intel_stolen_size (num, slot, func);
See above comments for needing to split this on before/after SNB. And wouldn't it be cool to unifying the SNB quirk dispatch with this table? Is that even possible?
Quoted 33 lines
arch/x86/kernel/early-quirks.c +18
-0+ start =intel_stolen_base (num, slot, func); +if (size && start) + goto found; +else +break ; + } + } + +/* No match or invalid data, don't bother reserving */ +return ; +found: +/* Mark this space as reserved */ +e820_add_region (start, size,E820_RESERVED ); +return ; +} +#define QFLAG_APPLY_ONCE 0x1#define QFLAG_APPLIED 0x2#define QFLAG_DONE (QFLAG_APPLY_ONCE|QFLAG_APPLIED)@@ -241,6 +389,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_VGA, PCI_ANY_ID, + QFLAG_APPLY_ONCE, intel_graphics_stolen }, {} };arch/x86/pci/early.c +0
-0
arch/x86/pci/early.c u16 read_pci_config_16(u8 bus, u8 slot, u8 func, u8 offset) · line 40
Quoted 10 lines
arch/x86/pci/early.c +7
-0@@ -31,6 +31,14 @@ u16 read_pci_config_16(u8 bus, u8 slot, u8 func, u8 offset)return v; } +u32 read_pci_config_32 (u8 bus,u8 slot,u8 func,u8 offset) +{ +u32 v; +outl (0x80000000 | (bus<<16 ) | (slot<<11 ) | (func<<8 ) | offset,0xcf8 ); + v =inl (0xcfc ); +return v; +}
This is just read_pci_config().
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Re: [PATCH 2/2] x86: add early quirk for reserving Intel graphics stolen memory
Quoted 4 lines · On Wed, 24 Jul 2013 18:59:02 +0100 Chris Wilson <[email protected]>…
Quoted 2 lines
+ * And yes, so far on current devices the base addr is always under 4G.
+ */And for the indefinite future.
Yeah going to 64 bits will require code changes too, I just wanted to head off that inevitable comment.
Quoted 4 lines
arch/x86/kernel/early-quirks.c static void __init intel_remapping_check(int num, int slot, int func) · line 234
Quoted 2 lines
arch/x86/kernel/early-quirks.c +2
-0+ base =read_pci_config_32 (num, slot, func,0x5c ); + base &= ~((1 <<20 ) -1 );I wish there was some synatic sugar we can apply for base &= -MB(1);
I think it's clear enough. Or is this a snarky comment that kernel.h has a macro for this you're not mentioning? :)
Quoted 13 lines
arch/x86/kernel/early-quirks.c static void __init intel_remapping_check(int num, int slot, int func) · line 243
Quoted 9 lines
arch/x86/kernel/early-quirks.c +9
-0+ +return base; +} + +#define KB (x) ((x) * 1024) +#define MB (x) (KB (KB (x))) +#define GB (x) (MB (KB (x))) + +static size_t __init intel_stolen_size (int num,int slot,int func)SNB+ has a different defintion. (And IVB has multiple definitions in the bspec, but we've found the SNB one works best...)
Quoted 3 lines
Quoted 1 line
+static struct
pci_device_idintel_stolen_ids[]__initdata= {const? Or is initdata already applying that fixup?
const and __initdata don't get along because then the compiler doesn't know which section to put the array in.
Quoted 16 lines
Quoted 16 lines
arch/x86/kernel/early-quirks.c +15
-0+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_16 (num, slot, func,PCI_DEVICE_ID ); + subvendor =read_pci_config_16 (num, slot, func, +PCI_SUBSYSTEM_VENDOR_ID ); + subdevice =read_pci_config_16 (num, slot, func,PCI_SUBSYSTEM_ID ); + +for (i =0 ; i <ARRAY_SIZE (intel_stolen_ids); i++) { + if (intel_stolen_ids[i].device == device && + (intel_stolen_ids[i].subvendor == PCI_ANY_ID ||
Quoted 8 lines
arch/x86/kernel/early-quirks.c static void __init intel_remapping_check(int num, int slot, int func) · line 342
Quoted 4 lines
arch/x86/kernel/early-quirks.c +4
-0+ intel_stolen_ids[i].subvendor == subvendor) && + (intel_stolen_ids[i].subdevice == PCI_ANY_ID || + intel_stolen_ids[i].subdevice == subdevice)) { + size =intel_stolen_size (num, slot, func);See above comments for needing to split this on before/after SNB. And wouldn't it be cool to unifying the SNB quirk dispatch with this table? Is that even possible?
I looked at it, there's not much in common aside from the PCI IDs. The SNB reservation occurs after the memory allocator is initialized (so we can steal the pages). It may be possible to do it earlier along with this code, but I'd say that's a separate patch either way.
Quoted 37 lines
Quoted 37 lines
arch/x86/kernel/early-quirks.c +18
-0+ start =intel_stolen_base (num, slot, func); +if (size && start) + goto found; +else +break ; + } + } + +/* No match or invalid data, don't bother reserving */ +return ; +found: +/* Mark this space as reserved */ +e820_add_region (start, size,E820_RESERVED ); +return ; +} +#define QFLAG_APPLY_ONCE 0x1#define QFLAG_APPLIED 0x2#define QFLAG_DONE (QFLAG_APPLY_ONCE|QFLAG_APPLIED)@@ -241,6 +389,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_VGA, PCI_ANY_ID, + QFLAG_APPLY_ONCE, intel_graphics_stolen }, {} };arch/x86/pci/early.c +0
-0@@ -31,6 +31,14 @@ u16 read_pci_config_16(u8 bus, u8 slot, u8 func, u8 offset)return v; }
Quoted 9 lines
arch/x86/pci/early.c u16 read_pci_config_16(u8 bus, u8 slot, u8 func, u8 offset) · line 40
Quoted 7 lines
arch/x86/pci/early.c +7
-0+u32 read_pci_config_32 (u8 bus,u8 slot,u8 func,u8 offset) +{ +u32 v; +outl (0x80000000 | (bus<<16 ) | (slot<<11 ) | (func<<8 ) | offset,0xcf8 ); + v =inl (0xcfc ); +return v; +}This is just
read_pci_config().
Oops missed it probably due to the consistent naming (_byte, _16, maybe we should add a _24). Will drop that bit.
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
Re: [PATCH 2/2] x86: add early quirk for reserving Intel graphics stolen memory
Quoted 9 lines · Jesse Barnes
Quoted 4 lines · On Wed, 24 Jul 2013 18:59:02 +0100 Chris Wilson <[email protected]>…
arch/x86/kernel/early-quirks.c static void __init intel_remapping_check(int num, int slot, int func) · line 234
Quoted 2 lines
arch/x86/kernel/early-quirks.c +2
-0+ base =read_pci_config_32 (num, slot, func,0x5c ); + base &= ~((1 <<20 ) -1 );I wish there was some synatic sugar we can apply for base &= -MB(1);
I think it's clear enough. Or is this a snarky comment that
kernel.hhas a macro for this you're not mentioning? :)
I was being sincere! It's an idiom that crops up often enough, so I wondering aloud if someone had a neat solution.
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Quoted 1 line · Jesse Barnes
For use by userspace (at some point in the future) and other kernel code.
Deal. Move it to include/uapi/drm/i915_chipsets.h or i915_pciids.h and we'll start using them.
There are too many people with OCD around here to let you get away with not using %04x for the pci-ids.
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Quoted 3 lines · Jesse Barnes
For use by userspace (at some point in the future) and other kernel code.
Signed-off-by Jesse Barnes <[email protected]>
Note that this split isn't too useful for userspace in newer generations. We still have the desktop/mobile split with since about ilk is meaningless for actual kernel code. Only recently with the haswell ult this changed again, but it's actually a different split. And userspace cares about gt1, gt2, ... for threads counts, which is not something too important in kernel land.
But the approach looks really good for sharing the table in the kernel, so I'm fine with it.
-Daniel
Quoted 378 lines
--- 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@@ -34,4 +34,184 @@ extern bool i915_gpu_raise(void);extern bool i915_gpu_lower (void );extern bool i915_gpu_busy (void );extern bool i915_gpu_turbo_disable (void ); + +#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 } + +#define INTEL_I830_IDS (info) \ + INTEL_VGA_DEVICE(0x3577, info) + +#define INTEL_I845G_IDS (info) \ + INTEL_VGA_DEVICE(0x2562, info) + +#define INTEL_I85X_IDS (info) \ + INTEL_VGA_DEVICE(0x3582, info),/* I855_GM */ \ + INTEL_VGA_DEVICE(0x358e, info) + +#define INTEL_I865G_IDS (info) \ + INTEL_VGA_DEVICE(0x2572, info)/* I865_G */ + +#define INTEL_I915G_IDS (info) \ + INTEL_VGA_DEVICE(0x2582, info),/* I915_G */ \ + INTEL_VGA_DEVICE(0x258a, info) /* E7221_G */ + +#define INTEL_I915GM_IDS (info) \ + INTEL_VGA_DEVICE(0x2592, info)/* I915_GM */ + +#define INTEL_I945G_IDS (info) \ + INTEL_VGA_DEVICE(0x2772, info)/* I945_G */ + +#define INTEL_I945GM_IDS (info) \ + INTEL_VGA_DEVICE(0x27a2, info),/* I945_GM */ \ + INTEL_VGA_DEVICE(0x27ae, info) /* I945_GME */ + +#define INTEL_I965G_IDS (info) \ + INTEL_VGA_DEVICE(0x2972, info),/* I946_GZ */ \ +INTEL_VGA_DEVICE (0x2982 , info),/* G35_G */ \ +INTEL_VGA_DEVICE (0x2992 , info),/* I965_Q */ \ + INTEL_VGA_DEVICE(0x29a2, info) /* I965_G */ + +#define INTEL_G33_IDS (info) \ + INTEL_VGA_DEVICE(0x29b2, info),/* Q35_G */ \ +INTEL_VGA_DEVICE (0x29c2 , info),/* G33_G */ \ + INTEL_VGA_DEVICE(0x29d2, info) /* Q33_G */ + +#define INTEL_I965GM_IDS (info) \ + INTEL_VGA_DEVICE(0x2a02, info),/* I965_GM */ \ + INTEL_VGA_DEVICE(0x2a12, info) /* I965_GME */ + +#define INTEL_GM45_IDS (info) \ + INTEL_VGA_DEVICE(0x2a42, info)/* GM45_G */ + +#define INTEL_G45_IDS (info) \ + INTEL_VGA_DEVICE(0x2e02, info),/* IGD_E_G */ \ +INTEL_VGA_DEVICE (0x2e12 , info),/* Q45_G */ \ +INTEL_VGA_DEVICE (0x2e22 , info),/* G45_G */ \ +INTEL_VGA_DEVICE (0x2e32 , info),/* G41_G */ \ +INTEL_VGA_DEVICE (0x2e42 , info),/* B43_G */ \ + INTEL_VGA_DEVICE(0x2e92, info) /* B43_G.1 */ + +#define INTEL_PINEVIEW_IDS (info) \ + INTEL_VGA_DEVICE(0xa001, info), \ + INTEL_VGA_DEVICE(0xa011, info) + +#define INTEL_IRONLAKE_D_IDS (info) \ + INTEL_VGA_DEVICE(0x0042, info) + +#define INTEL_IRONLAKE_M_IDS (info) \ + INTEL_VGA_DEVICE(0x0046, info) + +#define INTEL_SNB_D_IDS (info) \ + INTEL_VGA_DEVICE(0x0102, info), \ + INTEL_VGA_DEVICE(0x0112, info), \ + INTEL_VGA_DEVICE(0x0122, info), \ + INTEL_VGA_DEVICE(0x010A, info) + +#define INTEL_SNB_M_IDS (info) \ + INTEL_VGA_DEVICE(0x0106, info), \ + INTEL_VGA_DEVICE(0x0116, info), \ + INTEL_VGA_DEVICE(0x0126, info) + +#define INTEL_IVB_M_IDS (info) \ + INTEL_VGA_DEVICE(0x0156, info),/* GT1 mobile */ \ + INTEL_VGA_DEVICE(0x0166, info) /* GT2 mobile */ + +#define INTEL_IVB_D_IDS (info) \ + INTEL_VGA_DEVICE(0x0152, info),/* GT1 desktop */ \ +INTEL_VGA_DEVICE (0x0162 , info),/* GT2 desktop */ \ +INTEL_VGA_DEVICE (0x015a , info),/* GT1 server */ \ + INTEL_VGA_DEVICE(0x016a, info) /* GT2 server */ + +#define INTEL_IVB_Q_IDS (info) \ + INTEL_QUANTA_VGA_DEVICE(info)/* Quanta transcode */ + +#define INTEL_HSW_D_IDS (info) \ + INTEL_VGA_DEVICE(0x0402, info),/* GT1 desktop */ \ +INTEL_VGA_DEVICE (0x0412 , info),/* GT2 desktop */ \ +INTEL_VGA_DEVICE (0x0422 , info),/* GT3 desktop */ \ +INTEL_VGA_DEVICE (0x040a , info),/* GT1 server */ \ +INTEL_VGA_DEVICE (0x041a , info),/* GT2 server */ \ +INTEL_VGA_DEVICE (0x042a , info),/* GT3 server */ \ +INTEL_VGA_DEVICE (0x040B , info),/* GT1 reserved */ \ +INTEL_VGA_DEVICE (0x041B , info),/* GT2 reserved */ \ +INTEL_VGA_DEVICE (0x042B , info),/* GT3 reserved */ \ +INTEL_VGA_DEVICE (0x040E , info),/* GT1 reserved */ \ +INTEL_VGA_DEVICE (0x041E , info),/* GT2 reserved */ \ +INTEL_VGA_DEVICE (0x042E , info),/* GT3 reserved */ \ +INTEL_VGA_DEVICE (0x0C02 , info),/* SDV GT1 desktop */ \ +INTEL_VGA_DEVICE (0x0C12 , info),/* SDV GT2 desktop */ \ +INTEL_VGA_DEVICE (0x0C22 , info),/* SDV GT3 desktop */ \ +INTEL_VGA_DEVICE (0x0C0A , info),/* SDV GT1 server */ \ +INTEL_VGA_DEVICE (0x0C1A , info),/* SDV GT2 server */ \ +INTEL_VGA_DEVICE (0x0C2A , info),/* SDV GT3 server */ \ +INTEL_VGA_DEVICE (0x0C0B , info),/* SDV GT1 reserved */ \ +INTEL_VGA_DEVICE (0x0C1B , info),/* SDV GT2 reserved */ \ +INTEL_VGA_DEVICE (0x0C2B , info),/* SDV GT3 reserved */ \ +INTEL_VGA_DEVICE (0x0C0E , info),/* SDV GT1 reserved */ \ +INTEL_VGA_DEVICE (0x0C1E , info),/* SDV GT2 reserved */ \ +INTEL_VGA_DEVICE (0x0C2E , info),/* SDV GT3 reserved */ \ +INTEL_VGA_DEVICE (0x0A02 , info),/* ULT GT1 desktop */ \ +INTEL_VGA_DEVICE (0x0A12 , info),/* ULT GT2 desktop */ \ +INTEL_VGA_DEVICE (0x0A22 , info),/* ULT GT3 desktop */ \ +INTEL_VGA_DEVICE (0x0A0A , info),/* ULT GT1 server */ \ +INTEL_VGA_DEVICE (0x0A1A , info),/* ULT GT2 server */ \ +INTEL_VGA_DEVICE (0x0A2A , info),/* ULT GT3 server */ \ +INTEL_VGA_DEVICE (0x0A0B , info),/* ULT GT1 reserved */ \ +INTEL_VGA_DEVICE (0x0A1B , info),/* ULT GT2 reserved */ \ +INTEL_VGA_DEVICE (0x0A2B , info),/* ULT GT3 reserved */ \ +INTEL_VGA_DEVICE (0x0D02 , info),/* CRW GT1 desktop */ \ +INTEL_VGA_DEVICE (0x0D12 , info),/* CRW GT2 desktop */ \ +INTEL_VGA_DEVICE (0x0D22 , info),/* CRW GT3 desktop */ \ +INTEL_VGA_DEVICE (0x0D0A , info),/* CRW GT1 server */ \ +INTEL_VGA_DEVICE (0x0D1A , info),/* CRW GT2 server */ \ +INTEL_VGA_DEVICE (0x0D2A , info),/* CRW GT3 server */ \ +INTEL_VGA_DEVICE (0x0D0B , info),/* CRW GT1 reserved */ \ +INTEL_VGA_DEVICE (0x0D1B , info),/* CRW GT2 reserved */ \ +INTEL_VGA_DEVICE (0x0D2B , info),/* CRW GT3 reserved */ \ +INTEL_VGA_DEVICE (0x0D0E , info),/* CRW GT1 reserved */ \ +INTEL_VGA_DEVICE (0x0D1E , info),/* CRW GT2 reserved */ \ + INTEL_VGA_DEVICE(0x0D2E, info) /* CRW GT3 reserved */ \ + +#define INTEL_HSW_M_IDS(info) \ +INTEL_VGA_DEVICE (0x0406 , info),/* GT1 mobile */ \ +INTEL_VGA_DEVICE (0x0416 , info),/* GT2 mobile */ \ +INTEL_VGA_DEVICE (0x0426 , info),/* GT2 mobile */ \ +INTEL_VGA_DEVICE (0x0C06 , info),/* SDV GT1 mobile */ \ +INTEL_VGA_DEVICE (0x0C16 , info),/* SDV GT2 mobile */ \ +INTEL_VGA_DEVICE (0x0C26 , info),/* SDV GT3 mobile */ \ +INTEL_VGA_DEVICE (0x0A06 , info),/* ULT GT1 mobile */ \ +INTEL_VGA_DEVICE (0x0A16 , info),/* ULT GT2 mobile */ \ +INTEL_VGA_DEVICE (0x0A26 , info),/* ULT GT3 mobile */ \ +INTEL_VGA_DEVICE (0x0A0E , info),/* ULT GT1 reserved */ \ +INTEL_VGA_DEVICE (0x0A1E , info),/* ULT GT2 reserved */ \ +INTEL_VGA_DEVICE (0x0A2E , info),/* ULT GT3 reserved */ \ +INTEL_VGA_DEVICE (0x0D06 , info),/* CRW GT1 mobile */ \ +INTEL_VGA_DEVICE (0x0D16 , info),/* CRW GT2 mobile */ \ + INTEL_VGA_DEVICE(0x0D26, info) /* CRW GT3 mobile */ + +#define INTEL_VLV_M_IDS(info) \ + INTEL_VGA_DEVICE(0x0f30, info), \ + INTEL_VGA_DEVICE(0x0f31, info), \ + INTEL_VGA_DEVICE(0x0f32, info), \ + INTEL_VGA_DEVICE(0x0f33, info), \ + INTEL_VGA_DEVICE(0x0157, info) + +#define INTEL_VLV_D_IDS(info) \ +INTEL_VGA_DEVICE (0x0155 , info) + #endif /* _I915_DRM_H_ */Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Quoted 11 lines · Daniel Vetter
Quoted 3 lines · Jesse Barnes
For use by userspace (at some point in the future) and other kernel code.
Signed-off-by Jesse Barnes <[email protected]>Note that this split isn't too useful for userspace in newer generations. We still have the desktop/mobile split with since about ilk is meaningless for actual kernel code. Only recently with the haswell ult this changed again, but it's actually a different split. And userspace cares about gt1, gt2, ... for threads counts, which is not something too important in kernel land.
But things like SKU (mobile, desktop GT1, GT1++) are nicely encoded into the PCI ID anyway (much to the horror of those who have to write the matching tables), making for a much simpler test.
With the kernel's split, we can use the same listing in libdrm, intel-gpu-tools and the ddx, at least. We've gone from maintaining 6 distinct copies to 3, which is some improvement at least. (And I think the other 2 userspace copies could be converted.)
An alternative strategy that would work for at least the same set of userspace is for the kernel to provide SKU details (desktop/mobile, gt, etc) as a new ioctl... But for backwards compatability we would need to maintain the huge PCI ID tables in userspace so the benefit is moot. -Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre