drm/i915: split PCI IDs out into i915_drm.h v3
Subsystems (5)
PATCH 1/2 drm/i915: split PCI IDs out into i915_drm.h v3
For use by userspace (at some point in the future) and other kernel code.
v2: move PCI IDs to uabi (Chris)
move PCI IDs to drm/ (Dave)
v3: fixup Quanta detection - needs to come first (Daniel)
--- drivers/gpu/drm/i915/i915_drv.c | 164 +++++++----------------------- include/drm/i915_drm.h | 2 + include/drm/i915_pciids.h | 208 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 244 insertions(+), 130 deletions(-) create mode 100644 include/drm/i915_pciids.h
drivers/gpu/drm/i915/i915_drv.c +34 -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,41 @@ static const struct intel_device_info intel_haswell_m_info = { .has_vebox_ring = 1, }; +/* +* Make sure any device matches here are from most specific to most +* general. For example, since the Quanta match is based on the subsystem +* and subvendor IDs, we need it to come before the more general IVB +* PCI ID matches, otherwise we'll use the wrong info struct above. +*/ +#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_Q_IDS(&intel_ivybridge_q_info),/* must be first IVB */ \ +INTEL_IVB_M_IDS (&intel_ivybridge_m_info), \ +INTEL_IVB_D_IDS (&intel_ivybridge_d_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 +2 -0
@@ -26,6 +26,7 @@#ifndef _I915_DRM_H_#define _I915_DRM_H_ +#include <drm/i915_pciids.h> #include <uapi/drm/i915_drm.h> /* For use by IPS driver */
@@ -34,4 +35,5 @@ 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 ); +#endif /* _I915_DRM_H_ */
include/drm/i915_pciids.h new file +208 -0
208 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 v3
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.
v2: use read_pci_config for 32 bit reads instead of adding a new one
(Chris)
add gen6 stolen size function (Chris)
use a function pointer (Chris)
drop gen2 bits (Daniel)
--- arch/x86/kernel/early-quirks.c | 158 +++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_reg.h | 15 ---- include/drm/i915_drm.h | 32 ++++++++ 3 files changed, 190 insertions(+), 15 deletions(-)
arch/x86/kernel/early-quirks.c +158 -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,161 @@ static void __init intel_remapping_check(int num, int slot, int func) } +/* +* 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. +*/ +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 (num, slot, func,0x5c ); + base &= ~((1 <<20 ) -1 ); + +return base; +} + +#define KB (x) ((x) * 1024) +#define MB (x) (KB (KB (x))) +#define GB (x) (MB (KB (x))) + +static size_t __init gen3_stolen_size (int num,int slot,int func) +{ +size_t stolen_size; +u16 gmch_ctrl; + + gmch_ctrl =read_pci_config_16 (0 ,0 ,0 ,I830_GMCH_CTRL ); + +switch (gmch_ctrl &I855_GMCH_GMS_MASK ) { +case I855_GMCH_GMS_STOLEN_1M : + stolen_size =MB (1 ); +break ; +case I855_GMCH_GMS_STOLEN_4M : + stolen_size =MB (4 ); +break ; +case I855_GMCH_GMS_STOLEN_8M : + stolen_size =MB (8 ); +break ; +case I855_GMCH_GMS_STOLEN_16M : + stolen_size =MB (16 ); +break ; +case I855_GMCH_GMS_STOLEN_32M : + stolen_size =MB (32 ); +break ; +case I915_GMCH_GMS_STOLEN_48M : + stolen_size =MB (48 ); +break ; +case I915_GMCH_GMS_STOLEN_64M : + stolen_size =MB (64 ); +break ; +case G33_GMCH_GMS_STOLEN_128M : + stolen_size =MB (128 ); +break ; +case G33_GMCH_GMS_STOLEN_256M : + stolen_size =MB (256 ); +break ; +case INTEL_GMCH_GMS_STOLEN_96M : + stolen_size =MB (96 ); +break ; +case INTEL_GMCH_GMS_STOLEN_160M : + stolen_size =MB (160 ); +break ; +case INTEL_GMCH_GMS_STOLEN_224M : + stolen_size =MB (224 ); +break ; +case INTEL_GMCH_GMS_STOLEN_352M : + stolen_size =MB (352 ); +break ; +default : + stolen_size =0 ; +break ; + } + +return stolen_size; +} + +static size_t __init gen6_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 >>=SNB_GMCH_GMS_SHIFT ; + gmch_ctrl &=SNB_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 = { +INTEL_I915G_IDS (gen3_stolen_size), +INTEL_I915GM_IDS (gen3_stolen_size), +INTEL_I945G_IDS (gen3_stolen_size), +INTEL_I945GM_IDS (gen3_stolen_size), +INTEL_VLV_M_IDS (gen3_stolen_size), +INTEL_VLV_D_IDS (gen3_stolen_size), +INTEL_PINEVIEW_IDS (gen3_stolen_size), +INTEL_I965G_IDS (gen3_stolen_size), +INTEL_G33_IDS (gen3_stolen_size), +INTEL_I965GM_IDS (gen3_stolen_size), +INTEL_GM45_IDS (gen3_stolen_size), +INTEL_G45_IDS (gen3_stolen_size), +INTEL_IRONLAKE_D_IDS (gen3_stolen_size), +INTEL_IRONLAKE_M_IDS (gen3_stolen_size), +INTEL_SNB_D_IDS (gen6_stolen_size), +INTEL_SNB_M_IDS (gen6_stolen_size), +INTEL_IVB_M_IDS (gen6_stolen_size), +INTEL_IVB_D_IDS (gen6_stolen_size), +INTEL_HSW_D_IDS (gen6_stolen_size), +INTEL_HSW_M_IDS (gen6_stolen_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_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) { +stolen_size_fn stolen_size = + (stolen_size_fn )intel_stolen_ids[i].driver_data; + size =stolen_size (num, slot, func); + 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 +397,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 }, {} };
drivers/gpu/drm/i915/i915_reg.h +0 -15
@@ -33,21 +33,6 @@#define _MASKED_BIT_ENABLE (a) (((a) << 16) | (a))#define _MASKED_BIT_DISABLE (a) ((a) << 16) -/* -* The Bridge device's PCI config space has information about the -* fb aperture size and the amount of pre-reserved memory. -* This is all handled in the intel-gtt.ko module. i915.ko only -* cares about the vga bit for the vga rbiter. -*/ -#define INTEL_GMCH_CTRL 0x52 -#define INTEL_GMCH_VGA_DISABLE (1 << 1) -#define SNB_GMCH_CTRL 0x50 -#define SNB_GMCH_GGMS_SHIFT 8/* GTT Graphics Memory Size */ -#define SNB_GMCH_GGMS_MASK 0x3 -#define SNB_GMCH_GMS_SHIFT 3/* Graphics Mode Select */ -#define SNB_GMCH_GMS_MASK 0x1f - -/* PCI config space */ #define HPLLCC 0xc0/* 855 only */
include/drm/i915_drm.h +32 -0
@@ -36,4 +36,36 @@ extern bool i915_gpu_lower(void);extern bool i915_gpu_busy (void );extern bool i915_gpu_turbo_disable (void ); +/* +* The Bridge device's PCI config space has information about the +* fb aperture size and the amount of pre-reserved memory. +* This is all handled in the intel-gtt.ko module. i915.ko only +* cares about the vga bit for the vga rbiter. +*/ +#define INTEL_GMCH_CTRL 0x52 +#define INTEL_GMCH_VGA_DISABLE (1 << 1) +#define SNB_GMCH_CTRL 0x50 +#define SNB_GMCH_GGMS_SHIFT 8/* GTT Graphics Memory Size */ +#define SNB_GMCH_GGMS_MASK 0x3 +#define SNB_GMCH_GMS_SHIFT 3/* Graphics Mode Select */ +#define SNB_GMCH_GMS_MASK 0x1f + +#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) +#endif /* _I915_DRM_H_ */
Signature · 1 line
1.7.9.5
Re: [PATCH 2/2] x86: add early quirk for reserving Intel graphics stolen memory v3
Quoted 179 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.
v2: use
read_pci_configfor 32 bit reads instead of adding a new one
(Chris)
add gen6 stolen size function (Chris)
use a function pointer (Chris)
drop gen2 bits (Daniel)Signed-off-by Jesse Barnes <[email protected]>--- arch/x86/kernel/early-quirks.c | 158 +++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_reg.h | 15 ---- include/drm/i915_drm.h | 32 ++++++++ 3 files changed, 190 insertions(+), 15 deletions(-)arch/x86/kernel/early-quirks.c +143
-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,161 @@ static void __init intel_remapping_check(int num, int slot, int func) } +/* +* 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. +*/ +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 (num, slot, func,0x5c ); + base &= ~((1 <<20 ) -1 ); + +return base; +} + +#define KB (x) ((x) * 1024) +#define MB (x) (KB (KB (x))) +#define GB (x) (MB (KB (x))) + +static size_t __init gen3_stolen_size (int num,int slot,int func) +{ +size_t stolen_size; +u16 gmch_ctrl; + + gmch_ctrl =read_pci_config_16 (0 ,0 ,0 ,I830_GMCH_CTRL ); + +switch (gmch_ctrl &I855_GMCH_GMS_MASK ) { +case I855_GMCH_GMS_STOLEN_1M : + stolen_size =MB (1 ); +break ; +case I855_GMCH_GMS_STOLEN_4M : + stolen_size =MB (4 ); +break ; +case I855_GMCH_GMS_STOLEN_8M : + stolen_size =MB (8 ); +break ; +case I855_GMCH_GMS_STOLEN_16M : + stolen_size =MB (16 ); +break ; +case I855_GMCH_GMS_STOLEN_32M : + stolen_size =MB (32 ); +break ; +case I915_GMCH_GMS_STOLEN_48M : + stolen_size =MB (48 ); +break ; +case I915_GMCH_GMS_STOLEN_64M : + stolen_size =MB (64 ); +break ; +case G33_GMCH_GMS_STOLEN_128M : + stolen_size =MB (128 ); +break ; +case G33_GMCH_GMS_STOLEN_256M : + stolen_size =MB (256 ); +break ; +case INTEL_GMCH_GMS_STOLEN_96M : + stolen_size =MB (96 ); +break ; +case INTEL_GMCH_GMS_STOLEN_160M : + stolen_size =MB (160 ); +break ; +case INTEL_GMCH_GMS_STOLEN_224M : + stolen_size =MB (224 ); +break ; +case INTEL_GMCH_GMS_STOLEN_352M : + stolen_size =MB (352 ); +break ; +default : + stolen_size =0 ; +break ; + } + +return stolen_size; +} + +static size_t __init gen6_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 >>=SNB_GMCH_GMS_SHIFT ; + gmch_ctrl &=SNB_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 = { +INTEL_I915G_IDS (gen3_stolen_size), +INTEL_I915GM_IDS (gen3_stolen_size), +INTEL_I945G_IDS (gen3_stolen_size), +INTEL_I945GM_IDS (gen3_stolen_size), +INTEL_VLV_M_IDS (gen3_stolen_size), +INTEL_VLV_D_IDS (gen3_stolen_size), +INTEL_PINEVIEW_IDS (gen3_stolen_size), +INTEL_I965G_IDS (gen3_stolen_size), +INTEL_G33_IDS (gen3_stolen_size), +INTEL_I965GM_IDS (gen3_stolen_size), +INTEL_GM45_IDS (gen3_stolen_size), +INTEL_G45_IDS (gen3_stolen_size), +INTEL_IRONLAKE_D_IDS (gen3_stolen_size), +INTEL_IRONLAKE_M_IDS (gen3_stolen_size), +INTEL_SNB_D_IDS (gen6_stolen_size), +INTEL_SNB_M_IDS (gen6_stolen_size), +INTEL_IVB_M_IDS (gen6_stolen_size), +INTEL_IVB_D_IDS (gen6_stolen_size), +INTEL_HSW_D_IDS (gen6_stolen_size), +INTEL_HSW_M_IDS (gen6_stolen_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_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) { +stolen_size_fn stolen_size = + (stolen_size_fn )intel_stolen_ids[i].driver_data; + size =stolen_size (num, slot, func); + start =intel_stolen_base (num, slot, func); +if (size && start) + goto found;
arch/x86/kernel/early-quirks.c static void __init intel_remapping_check(int num, int slot, int func) · line 363
Quoted 10 lines
arch/x86/kernel/early-quirks.c +10
-0+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 );
Two bikesheds:
- Can't we give the thing a better name like "Intel Graphics Stolen"?
- Can't we store the iomem region somewhere so that intel-gtt.ko and i915.ko can get at it and we could drop the duplicated stolen detection code?
Cheers, Daniel
Quoted 89 lines
arch/x86/kernel/early-quirks.c +5
-0+return ; +} +#define QFLAG_APPLY_ONCE 0x1#define QFLAG_APPLIED 0x2#define QFLAG_DONE (QFLAG_APPLY_ONCE|QFLAG_APPLIED)@@ -241,6 +397,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 }, {} };drivers/gpu/drm/i915/i915_reg.h +0
-15@@ -33,21 +33,6 @@#define _MASKED_BIT_ENABLE (a) (((a) << 16) | (a))#define _MASKED_BIT_DISABLE (a) ((a) << 16) -/* -* The Bridge device's PCI config space has information about the -* fb aperture size and the amount of pre-reserved memory. -* This is all handled in the intel-gtt.ko module. i915.ko only -* cares about the vga bit for the vga rbiter. -*/ -#define INTEL_GMCH_CTRL 0x52 -#define INTEL_GMCH_VGA_DISABLE (1 << 1) -#define SNB_GMCH_CTRL 0x50 -#define SNB_GMCH_GGMS_SHIFT 8/* GTT Graphics Memory Size */ -#define SNB_GMCH_GGMS_MASK 0x3 -#define SNB_GMCH_GMS_SHIFT 3/* Graphics Mode Select */ -#define SNB_GMCH_GMS_MASK 0x1f - -/* PCI config space */ #define HPLLCC 0xc0/* 855 only */ include/drm/i915_drm.h +32
-0@@ -36,4 +36,36 @@ extern bool i915_gpu_lower(void);extern bool i915_gpu_busy (void );extern bool i915_gpu_turbo_disable (void ); +/* +* The Bridge device's PCI config space has information about the +* fb aperture size and the amount of pre-reserved memory. +* This is all handled in the intel-gtt.ko module. i915.ko only +* cares about the vga bit for the vga rbiter. +*/ +#define INTEL_GMCH_CTRL 0x52 +#define INTEL_GMCH_VGA_DISABLE (1 << 1) +#define SNB_GMCH_CTRL 0x50 +#define SNB_GMCH_GGMS_SHIFT 8/* GTT Graphics Memory Size */ +#define SNB_GMCH_GGMS_MASK 0x3 +#define SNB_GMCH_GMS_SHIFT 3/* Graphics Mode Select */ +#define SNB_GMCH_GMS_MASK 0x1f + +#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) +#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
Re: [PATCH 2/2] x86: add early quirk for reserving Intel graphics stolen memory v3
Quoted 3 lines · Daniel Vetter
On Wed, Jul 24, 2013 at 05:04:43PM -0700, Jesse Barnes wrote:
Two bikesheds:
- Can't we give the thing a better name like "Intel Graphics Stolen"?
Using a custom type and name seems simple enough and naturally leads it to ending up in iomem_resource.
Quoted 3 lines
- Can't we store the iomem region somewhere so that intel-gtt.ko and i915.ko can get at it and we could drop the duplicated stolen detection code?
The choice is then walking the resource list looking for our named region or reading a couple of registers. Certainly walking the iomem makes everything much clearer.
-Chris
arch/x86/include/uapi/asm/e820.h +1 -0
@@ -38,6 +38,7 @@#define E820_NVS 4#define E820_UNUSABLE 5 +#define E820_STOLEN_IGFX 6/* * reserved RAM used by kernel itself
arch/x86/kernel/e820.c +4 -0
@@ -149,6 +149,10 @@ static void __init e820_print_type(u32 type)case E820_UNUSABLE :printk (KERN_CONT "unusable" );break ; + +case E820_STOLEN_IGFX : +printk (KERN_CONT "Intel Graphics Stolen" ); +break ;default :printk (KERN_CONT "type %u" , type);break ;
arch/x86/kernel/early-quirks.c +2 -10
@@ -350,18 +350,10 @@ static void __init intel_graphics_stolen(int num, int slot, int func) size =stolen_size (num, slot, func); start =intel_stolen_base (num, slot, func);if (size && start) - goto found; -else -break ; +e820_add_region (start, size,E820_STOLEN_IGFX ); +return ; } } - -/* 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
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Re: [PATCH 2/2] x86: add early quirk for reserving Intel graphics stolen memory v3
Quoted 8 lines · Chris Wilson
Quoted 3 lines · Daniel Vetter
On Wed, Jul 24, 2013 at 05:04:43PM -0700, Jesse Barnes wrote:
Two bikesheds:
- Can't we give the thing a better name like "Intel Graphics Stolen"?Using a custom type and name seems simple enough and naturally leads it to ending up in
iomem_resource.
Quoted 7 lines
Quoted 3 lines
- Can't we store the iomem region somewhere so that intel-gtt.ko and i915.ko can get at it and we could drop the duplicated stolen detection code?
The choice is then walking the resource list looking for our named region or reading a couple of registers. Certainly walking the iomem makes everything much clearer.
Oh, I like this ;-)
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
PATCH 1/3 x86: Use a custom name for the Intel Graphics Stolen reservation
In reply to Jesse BarnesBy giving the stolen a region a unique type and name, we then insert it into the iomem_resource as a known resource. This clear identifies it to the user when printing the e820 map (and later the iomem resources), and exposes it to the driver for later use.
--- arch/x86/include/uapi/asm/e820.h | 2 ++ arch/x86/kernel/e820.c | 4 ++++ arch/x86/kernel/early-quirks.c | 12 ++---------- 3 files changed, 8 insertions(+), 10 deletions(-)
arch/x86/include/uapi/asm/e820.h +2 -0
@@ -38,6 +38,8 @@#define E820_NVS 4#define E820_UNUSABLE 5 +#define E820_STOLEN_IGFX 6 +#define E820_STOLEN_IGFX_STRING "Intel Graphics Stolen"/* * reserved RAM used by kernel itself
arch/x86/kernel/e820.c +4 -0
@@ -149,6 +149,10 @@ static void __init e820_print_type(u32 type)case E820_UNUSABLE :printk (KERN_CONT "unusable" );break ; + +case E820_STOLEN_IGFX : + printk(KERN_CONT E820_STOLEN_IGFX_STRING); +break ;default :printk (KERN_CONT "type %u" , type);break ;
arch/x86/kernel/early-quirks.c +2 -10
@@ -350,18 +350,10 @@ static void __init intel_graphics_stolen(int num, int slot, int func) size =stolen_size (num, slot, func); start =intel_stolen_base (num, slot, func);if (size && start) - goto found; -else -break ; +e820_add_region (start, size,E820_STOLEN_IGFX ); +return ; } } - -/* 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
Signature · 1 line
1.8.3.2
PATCH 2/3 resource: Introduce lookup_resource_by_name()
This is useful for drivers to find a resource inserted by, for example, an early PCI quirk.
--- include/linux/ioport.h | 2 ++ kernel/resource.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+)
include/linux/ioport.h +2 -0
@@ -158,6 +158,8 @@ extern int allocate_resource(struct resource *root, struct resource *new, resource_size_t), void *alignf_data);struct resource *lookup_resource (struct resource *root,resource_size_t start); +struct resource *lookup_resource_by_name (struct resource *root, +const char *name);int adjust_resource (struct resource *res,resource_size_t start,resource_size_t size);resource_size_t resource_alignment (struct resource *res);
kernel/resource.c +14 -0
@@ -624,6 +624,20 @@ struct resource *lookup_resource(struct resource *root, resource_size_t start)return res; } +struct resource *lookup_resource_by_name (struct resource *root,const char *name) +{ +struct resource *res; + +read_lock (&resource_lock); +for (res = root->child; res; res = res->sibling) { +if (strcmp (res->name, name) ==0 ) +break ; + } +read_unlock (&resource_lock); + +return res; +} +/* * Insert a resource into the resource tree. If successful, return NULL, * otherwise return the conflicting resource (compare to __request_resource())
Signature · 1 line
1.8.3.2
PATCH 3/3 drm/i915: Lookup stolen region reserved during early PCI quirk processing
In reply to Chris WilsonAs we now hook into the early PCI quirk table to earmark the Intel Graphics Stolen region (inserting it into the iomem_resource) to prevent it conflicting with any later resource allocations, we can simply walk the iomem_resource tree and find it for our use. Thereby removing all of our own code to define the stolen region.
--- drivers/char/agp/intel-gtt.c | 92 +++------------------------------- drivers/gpu/drm/i915/i915_drv.h | 3 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 15 +----- drivers/gpu/drm/i915/i915_gem_stolen.c | 70 ++++++-------------------- include/drm/intel-gtt.h | 2 +- 5 files changed, 26 insertions(+), 156 deletions(-)
drivers/char/agp/intel-gtt.c +8 -84
@@ -343,90 +343,15 @@ static const struct aper_size_info_fixed intel_fake_agp_sizes[] = {static unsigned int intel_gtt_stolen_size (void ) { -u16 gmch_ctrl; -u8 rdct; -int local =0 ; -static const int ddt[4 ] = {0 ,16 ,32 ,64 }; -unsigned int stolen_size =0 ; - -if (INTEL_GTT_GEN ==1 ) -return 0 ;/* no stolen mem on i81x */ - -pci_read_config_word (intel_private.bridge_dev, -I830_GMCH_CTRL , &gmch_ctrl); +struct resource *r; +unsigned int stolen_size; -if (intel_private.bridge_dev->device ==PCI_DEVICE_ID_INTEL_82830_HB || - intel_private.bridge_dev->device ==PCI_DEVICE_ID_INTEL_82845G_HB ) { -switch (gmch_ctrl &I830_GMCH_GMS_MASK ) { -case I830_GMCH_GMS_STOLEN_512 : - stolen_size =KB (512 ); -break ; -case I830_GMCH_GMS_STOLEN_1024 : - stolen_size =MB (1 ); -break ; -case I830_GMCH_GMS_STOLEN_8192 : - stolen_size =MB (8 ); -break ; -case I830_GMCH_GMS_LOCAL : - rdct =readb (intel_private.registers+I830_RDRAM_CHANNEL_TYPE ); - stolen_size = (I830_RDRAM_ND (rdct) +1 ) * -MB (ddt[I830_RDRAM_DDT (rdct)]); - local =1 ; -break ; -default : - stolen_size =0 ; -break ; - } - }else { -switch (gmch_ctrl &I855_GMCH_GMS_MASK ) { -case I855_GMCH_GMS_STOLEN_1M : - stolen_size =MB (1 ); -break ; -case I855_GMCH_GMS_STOLEN_4M : - stolen_size =MB (4 ); -break ; -case I855_GMCH_GMS_STOLEN_8M : - stolen_size =MB (8 ); -break ; -case I855_GMCH_GMS_STOLEN_16M : - stolen_size =MB (16 ); -break ; -case I855_GMCH_GMS_STOLEN_32M : - stolen_size =MB (32 ); -break ; -case I915_GMCH_GMS_STOLEN_48M : - stolen_size =MB (48 ); -break ; -case I915_GMCH_GMS_STOLEN_64M : - stolen_size =MB (64 ); -break ; -case G33_GMCH_GMS_STOLEN_128M : - stolen_size =MB (128 ); -break ; -case G33_GMCH_GMS_STOLEN_256M : - stolen_size =MB (256 ); -break ; -case INTEL_GMCH_GMS_STOLEN_96M : - stolen_size =MB (96 ); -break ; -case INTEL_GMCH_GMS_STOLEN_160M : - stolen_size =MB (160 ); -break ; -case INTEL_GMCH_GMS_STOLEN_224M : - stolen_size =MB (224 ); -break ; -case INTEL_GMCH_GMS_STOLEN_352M : - stolen_size =MB (352 ); -break ; -default : - stolen_size =0 ; -break ; - } - } + r =lookup_resource_by_name (&iomem_resource,E820_STOLEN_IGFX_STRING ); -if (stolen_size >0 ) { -dev_info (&intel_private.bridge_dev->dev,"detected %dK %s memory\n" , - stolen_size /KB (1 ), local ?"local" :"stolen" ); +if (r) { + stolen_size = r->end - r->start +1 ; +dev_info (&intel_private.bridge_dev->dev,"detected %dK stolen memory\n" , + stolen_size /KB (1 )); }else {dev_info (&intel_private.bridge_dev->dev,"no pre-allocated video memory detected\n" );
@@ -1404,11 +1329,10 @@ int intel_gmch_probe(struct pci_dev *bridge_pdev, struct pci_dev *gpu_pdev, }EXPORT_SYMBOL (intel_gmch_probe); -void intel_gtt_get (size_t *gtt_total,size_t *stolen_size, +void intel_gtt_get (size_t *gtt_total,phys_addr_t *mappable_base,unsigned long *mappable_end) { *gtt_total = intel_private.gtt_total_entries <<PAGE_SHIFT ; - *stolen_size = intel_private.stolen_size; *mappable_base = intel_private.gma_bus_addr; *mappable_end = intel_private.gtt_mappable_entries <<PAGE_SHIFT ; }
drivers/gpu/drm/i915/i915_drv.h +1 -2
@@ -513,7 +513,6 @@ struct i915_address_space {*/ struct i915_gtt {struct i915_address_space base; -size_t stolen_size;/* Total size of stolen memory */ unsigned long mappable_end;/* End offset that we can CPU map */ struct io_mapping *mappable;/* Mapping to our CPU mappable region */
@@ -528,7 +527,7 @@ struct i915_gtt {/* global gtt ops */ int (*gtt_probe)(struct drm_device *dev,size_t *gtt_total, -size_t *stolen,phys_addr_t *mappable_base, +phys_addr_t *mappable_base,unsigned long *mappable_end); };#define gtt_total_entries (gtt) ((gtt).base.total >> PAGE_SHIFT)
drivers/gpu/drm/i915/i915_gem_gtt.c +2 -13
@@ -784,16 +784,8 @@ static inline unsigned int gen6_get_total_gtt_size(u16 snb_gmch_ctl)return snb_gmch_ctl <<20 ; } -static inline size_t gen6_get_stolen_size (u16 snb_gmch_ctl) -{ - snb_gmch_ctl >>=SNB_GMCH_GMS_SHIFT ; - snb_gmch_ctl &=SNB_GMCH_GMS_MASK ; -return snb_gmch_ctl <<25 ;/* 32 MB units */ -} -static int gen6_gmch_probe (struct drm_device *dev,size_t *gtt_total, -size_t *stolen,phys_addr_t *mappable_base,unsigned long *mappable_end) {
@@ -820,7 +812,6 @@ static int gen6_gmch_probe(struct drm_device *dev,pci_read_config_word (dev->pdev,SNB_GMCH_CTRL , &snb_gmch_ctl); gtt_size =gen6_get_total_gtt_size (snb_gmch_ctl); - *stolen =gen6_get_stolen_size (snb_gmch_ctl); *gtt_total = (gtt_size /sizeof (gen6_gtt_pte_t)) <<PAGE_SHIFT ;/* For Modern GENs the PTEs and register space are split in the BAR */
@@ -853,7 +844,6 @@ static void gen6_gmch_remove(struct i915_address_space *vm)static int i915_gmch_probe (struct drm_device *dev,size_t *gtt_total, -size_t *stolen,phys_addr_t *mappable_base,unsigned long *mappable_end) {
@@ -866,7 +856,7 @@ static int i915_gmch_probe(struct drm_device *dev,return -EIO ; } -intel_gtt_get (gtt_total, stolen, mappable_base, mappable_end); +intel_gtt_get (gtt_total, mappable_base, mappable_end); dev_priv->gtt.do_idle_maps =needs_idle_maps (dev_priv->dev); dev_priv->gtt.base.clear_range = i915_ggtt_clear_range;
@@ -902,7 +892,7 @@ int i915_gem_gtt_init(struct drm_device *dev) gtt->base.pte_encode = gen6_pte_encode; } - ret = gtt->gtt_probe (dev, >t->base.total, >t->stolen_size, + ret = gtt->gtt_probe (dev, >t->base.total, >t->mappable_base, >t->mappable_end);if (ret)return ret;
@@ -913,7 +903,6 @@ int i915_gem_gtt_init(struct drm_device *dev)DRM_INFO ("Memory usable by graphics device = %zdM\n" , gtt->base.total >>20 );DRM_DEBUG_DRIVER ("GMADR size = %ldM\n" , gtt->mappable_end >>20 ); -DRM_DEBUG_DRIVER ("GTT stolen size = %zdM\n" , gtt->stolen_size >>20 );return 0 ; }
drivers/gpu/drm/i915/i915_gem_stolen.c +14 -56
105 lines not on this page · raw message
include/drm/intel-gtt.h +1 -1
@@ -3,7 +3,7 @@#ifndef _DRM_INTEL_GTT_H#define _DRM_INTEL_GTT_H -void intel_gtt_get (size_t *gtt_total,size_t *stolen_size, +void intel_gtt_get (size_t *gtt_total,phys_addr_t *mappable_base,unsigned long *mappable_end); int intel_gmch_probe(struct pci_dev *bridge_pdev, struct pci_dev *gpu_pdev,
Signature · 1 line
1.8.3.2
Quoted 15 lines · Jesse Barnes
For use by userspace (at some point in the future) and other kernel code.
v2: move PCI IDs to uabi (Chris)
move PCI IDs to drm/ (Dave)
v3: fixup Quanta detection - needs to come first (Daniel)Signed-off-by Jesse Barnes <[email protected]>--- drivers/gpu/drm/i915/i915_drv.c | 164 +++++++----------------------- include/drm/i915_drm.h | 2 + include/drm/i915_pciids.h | 208 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 244 insertions(+), 130 deletions(-)create mode 100644
include/drm/i915_pciids.h
include/drm/i915_pciids.h line 36
Quoted 8 lines
include/drm/i915_pciids.h new file +8
-0+#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 }
I retract my objections from yesterday. I expected the header to define a static table (like static const struct xxx i915_pci_ids[] = ...), which I didn't like due its inflexibility. But, this macro I do like. It's flexible enough.