make stolen resource centric
Subsystems (6)
cover make stolen resource centric
Continuation of Paulo' stolen series[1], addressing the feedback from Joonas and Chris.
[1] https://patchwork.freedesktop.org/series/30923/
Joonas Lahtinen (1):
x86/early-quirks: Extend Intel graphics stolen memory placement to
64bit
Matthew Auld (9):
x86/early-quirks: replace the magical increment start values x86/early-quirks: reverse the if ladders
drm/i915: nuke the duplicated stolen discovery drm/i915: make dsm struct resource centric
drm/i915: make reserved struct resource centric drm/i915: make mappable struct resource centric drm/i915: give stolen_usable_size a more suitable home drm/i915: prefer resource_size_t for everything stolen drm/i915: prefer stolen_usable_size for the range sanity check
arch/x86/kernel/early-quirks.c | 92 +++++---- drivers/char/agp/intel-gtt.c | 14 +- drivers/gpu/drm/i915/gvt/gvt.h | 2 +- drivers/gpu/drm/i915/i915_debugfs.c | 4 +- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 35 +++- drivers/gpu/drm/i915/i915_gem.c | 8 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 92 +++------ drivers/gpu/drm/i915/i915_gem_gtt.h | 19 +- drivers/gpu/drm/i915/i915_gem_stolen.c | 264 ++++++++------------------ drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- drivers/gpu/drm/i915/i915_vma.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 5 +- drivers/gpu/drm/i915/intel_fbc.c | 13 +- drivers/gpu/drm/i915/intel_fbdev.c | 3 +- drivers/gpu/drm/i915/intel_overlay.c | 4 +- drivers/gpu/drm/i915/intel_pm.c | 31 +-- drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 4 +- drivers/gpu/drm/i915/selftests/mock_gtt.c | 4 +- include/drm/i915_drm.h | 3 + include/drm/intel-gtt.h | 3 +- 22 files changed, 236 insertions(+), 372 deletions(-)
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/10 x86/early-quirks: Extend Intel graphics stolen memory placement to 64bit
From: Joonas Lahtinen <[email protected]>
To give upcoming SKU BIOSes more flexibility in placing the Intel graphics stolen memory, make all variables storing the placement or size compatible with full 64 bit range. Also by exporting the stolen region as a resource, we can then nuke the duplicated stolen discovery in i915.
v2: export the stolen region as a resource
fix u16 << 16 (Chris)
v3: actually fix u16 << 16
Signed-off-by Joonas Lahtinen <[email protected]>
Signed-off-by Matthew Auld <[email protected]>
Cc Joonas Lahtinen <[email protected]>
Cc Ville Syrjälä <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Paulo Zanoni <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc H. Peter Anvin <[email protected]>
Reviewed-by Chris Wilson <[email protected]> #v1
--- arch/x86/kernel/early-quirks.c | 86 +++++++++++++++++++++++------------------- include/drm/i915_drm.h | 3 ++ 2 files changed, 50 insertions(+), 39 deletions(-)
arch/x86/kernel/early-quirks.c +47 -39
@@ -243,7 +243,7 @@ static void __init intel_remapping_check(int num, int slot, int func)#define KB (x) ((x) * 1024UL)#define MB (x) (KB (KB (x))) -static size_t __init i830_tseg_size (void ) +static resource_size_t __init i830_tseg_size (void ) {u8 esmramc =read_pci_config_byte (0 ,0 ,0 ,I830_ESMRAMC );
@@ -256,7 +256,7 @@ static size_t __init i830_tseg_size(void)return KB (512 ); } -static size_t __init i845_tseg_size (void ) +static resource_size_t __init i845_tseg_size (void ) {u8 esmramc =read_pci_config_byte (0 ,0 ,0 ,I845_ESMRAMC );u8 tseg_size = esmramc &I845_TSEG_SIZE_MASK ;
@@ -273,7 +273,7 @@ static size_t __init i845_tseg_size(void)return 0 ; } -static size_t __init i85x_tseg_size (void ) +static resource_size_t __init i85x_tseg_size (void ) {u8 esmramc =read_pci_config_byte (0 ,0 ,0 ,I85X_ESMRAMC );
@@ -283,12 +283,12 @@ static size_t __init i85x_tseg_size(void)return MB (1 ); } -static size_t __init i830_mem_size (void ) +static resource_size_t __init i830_mem_size (void ) {return read_pci_config_byte (0 ,0 ,0 ,I830_DRB3 ) *MB (32 ); } -static size_t __init i85x_mem_size (void ) +static resource_size_t __init i85x_mem_size (void ) {return read_pci_config_byte (0 ,0 ,1 ,I85X_DRB3 ) *MB (32 ); }
@@ -297,36 +297,36 @@ static size_t __init i85x_mem_size(void)* On 830/845/85x the stolen memory base isn't available in any * register. We need to calculate it as TOM-TSEG_SIZE-stolen_size. */ -static phys_addr_t __init i830_stolen_base (int num,int slot,int func, -size_t stolen_size) +static resource_size_t __init i830_stolen_base (int num,int slot,int func, +resource_size_t stolen_size) { -return (phys_addr_t )i830_mem_size () -i830_tseg_size () - stolen_size; +return i830_mem_size () -i830_tseg_size () - stolen_size; } -static phys_addr_t __init i845_stolen_base (int num,int slot,int func, -size_t stolen_size) +static resource_size_t __init i845_stolen_base (int num,int slot,int func, +resource_size_t stolen_size) { -return (phys_addr_t )i830_mem_size () -i845_tseg_size () - stolen_size; +return i830_mem_size () -i845_tseg_size () - stolen_size; } -static phys_addr_t __init i85x_stolen_base (int num,int slot,int func, -size_t stolen_size) +static resource_size_t __init i85x_stolen_base (int num,int slot,int func, +resource_size_t stolen_size) { -return (phys_addr_t )i85x_mem_size () -i85x_tseg_size () - stolen_size; +return i85x_mem_size () -i85x_tseg_size () - stolen_size; } -static phys_addr_t __init i865_stolen_base (int num,int slot,int func, -size_t stolen_size) +static resource_size_t __init i865_stolen_base (int num,int slot,int func, +resource_size_t stolen_size) {u16 toud =0 ; toud =read_pci_config_16 (0 ,0 ,0 ,I865_TOUD ); -return (phys_addr_t)(toud <<16 ) +i845_tseg_size (); +return (toud *KB (64 )) +i845_tseg_size (); } -static phys_addr_t __init gen3_stolen_base (int num,int slot,int func, -size_t stolen_size) +static resource_size_t __init gen3_stolen_base (int num,int slot,int func, +resource_size_t stolen_size) {u32 bsm;
@@ -337,10 +337,10 @@ static phys_addr_t __init gen3_stolen_base(int num, int slot, int func,*/ bsm =read_pci_config (num, slot, func,INTEL_BSM ); -return (phys_addr_t )bsm &INTEL_BSM_MASK ; +return bsm &INTEL_BSM_MASK ; } -static size_t __init i830_stolen_size (int num,int slot,int func) +static resource_size_t __init i830_stolen_size (int num,int slot,int func) {u16 gmch_ctrl;u16 gms;
@@ -361,7 +361,7 @@ static size_t __init i830_stolen_size(int num, int slot, int func)return 0 ; } -static size_t __init gen3_stolen_size (int num,int slot,int func) +static resource_size_t __init gen3_stolen_size (int num,int slot,int func) {u16 gmch_ctrl;u16 gms;
@@ -390,7 +390,7 @@ static size_t __init gen3_stolen_size(int num, int slot, int func)return 0 ; } -static size_t __init gen6_stolen_size (int num,int slot,int func) +static resource_size_t __init gen6_stolen_size (int num,int slot,int func) {u16 gmch_ctrl;u16 gms;
@@ -398,10 +398,10 @@ static size_t __init gen6_stolen_size(int num, int slot, int func) gmch_ctrl =read_pci_config_16 (num, slot, func,SNB_GMCH_CTRL ); gms = (gmch_ctrl >>SNB_GMCH_GMS_SHIFT ) &SNB_GMCH_GMS_MASK ; -return (size_t )gms *MB (32 ); +return gms *MB (32 ); } -static size_t __init gen8_stolen_size (int num,int slot,int func) +static resource_size_t __init gen8_stolen_size (int num,int slot,int func) {u16 gmch_ctrl;u16 gms;
@@ -409,10 +409,10 @@ static size_t __init gen8_stolen_size(int num, int slot, int func) gmch_ctrl =read_pci_config_16 (num, slot, func,SNB_GMCH_CTRL ); gms = (gmch_ctrl >>BDW_GMCH_GMS_SHIFT ) &BDW_GMCH_GMS_MASK ; -return (size_t )gms *MB (32 ); +return gms *MB (32 ); } -static size_t __init chv_stolen_size (int num,int slot,int func) +static resource_size_t __init chv_stolen_size (int num,int slot,int func) {u16 gmch_ctrl;u16 gms;
@@ -426,14 +426,14 @@ static size_t __init chv_stolen_size(int num, int slot, int func)* 0x17 to 0x1d: 4MB increments start at 36MB */ if (gms <0x11 ) -return (size_t )gms *MB (32 ); +return gms *MB (32 );else if (gms <0x17 ) -return (size_t )(gms -0x11 +2 ) *MB (4 ); +return (gms -0x11 +2 ) *MB (4 );else -return (size_t )(gms -0x17 +9 ) *MB (4 ); +return (gms -0x17 +9 ) *MB (4 ); } -static size_t __init gen9_stolen_size (int num,int slot,int func) +static resource_size_t __init gen9_stolen_size (int num,int slot,int func) {u16 gmch_ctrl;u16 gms;
@@ -444,14 +444,15 @@ static size_t __init gen9_stolen_size(int num, int slot, int func)/* 0x0 to 0xef: 32MB increments starting at 0MB */ /* 0xf0 to 0xfe: 4MB increments starting at 4MB */ if (gms <0xf0 ) -return (size_t )gms *MB (32 ); +return gms *MB (32 );else -return (size_t )(gms -0xf0 +1 ) *MB (4 ); +return (gms -0xf0 +1 ) *MB (4 ); }struct intel_early_ops { -size_t (*stolen_size)(int num,int slot,int func); -phys_addr_t (*stolen_base)(int num,int slot,int func,size_t size); +resource_size_t (*stolen_size)(int num,int slot,int func); +resource_size_t (*stolen_base)(int num,int slot,int func, +resource_size_t size); };static const struct intel_early_ops i830_early_ops__initconst = {
@@ -531,12 +532,15 @@ static const struct pci_device_id intel_early_ids[] __initconst = { INTEL_CNL_IDS(&gen9_early_ops), }; +struct resource intel_graphics_stolen_res =DEFINE_RES_MEM (0 ,0 ); +EXPORT_SYMBOL (intel_graphics_stolen_res); +static void __init intel_graphics_stolen (int num,int slot,int func,const struct intel_early_ops *early_ops) { -phys_addr_t base, end; -size_t size; +resource_size_t base, size; +resource_size_t end; size = early_ops->stolen_size (num, slot, func); base = early_ops->stolen_base (num, slot, func, size);
@@ -545,8 +549,12 @@ intel_graphics_stolen(int num, int slot, int func,return ; end = base + size -1 ; -printk (KERN_INFO "Reserving Intel graphics memory at %pa-%pa\n" , - &base, &end); + + intel_graphics_stolen_res.start = base; + intel_graphics_stolen_res.end = end; + +printk (KERN_INFO "Reserving Intel graphics memory at %pR\n" , + &intel_graphics_stolen_res);/* Mark this space as reserved */ e820__range_add (base, size,E820_TYPE_RESERVED );
include/drm/i915_drm.h +3 -0
@@ -36,6 +36,9 @@ extern bool i915_gpu_lower(void);extern bool i915_gpu_busy (void );extern bool i915_gpu_turbo_disable (void ); +/* Exported from arch/x86/kernel/early-quirks.c */ +extern struct resource intel_graphics_stolen_res; +/* * The Bridge device's PCI config space has information about the * fb aperture size and the amount of pre-reserved memory.
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 01/10] x86/early-quirks: Extend Intel graphics stolen memory placement to 64bit
Quoting Matthew Auld (2017-12-06 18:17:21)
Quoted 24 lines
From: Joonas Lahtinen <[email protected]>
To give upcoming SKU BIOSes more flexibility in placing the Intel graphics stolen memory, make all variables storing the placement or size compatible with full 64 bit range. Also by exporting the stolen region as a resource, we can then nuke the duplicated stolen discovery in i915.
v2: export the stolen region as a resource
fix u16 << 16 (Chris)v3: actually fix u16 << 16
Signed-off-by Joonas Lahtinen <[email protected]>Signed-off-by Matthew Auld <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Ville Syrjälä <[email protected]>Cc Chris Wilson <[email protected]>Cc Paulo Zanoni <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc H. Peter Anvin <[email protected]>Reviewed-by Chris Wilson <[email protected]> #v1---
arch/x86/kernel/early-quirks.c static size_t __init i85x_mem_size(void) · line 325
Quoted 9 lines
arch/x86/kernel/early-quirks.c +3
-1+static resource_size_t __init i865_stolen_base (int num,int slot,int func, +resource_size_t stolen_size) {u16 toud =0 ; toud =read_pci_config_16 (0 ,0 ,0 ,I865_TOUD ); -return (phys_addr_t)(toud <<16 ) +i845_tseg_size (); +return (toud *KB (64 )) +i845_tseg_size ();
Overkill on the brackets.
Reviewed-by Chris Wilson <[email protected]>
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/10 x86/early-quirks: replace the magical increment start values
In reply to Matthew AuldReplace the magical +2, +9 etc. with +MB, which is far easier to read.
Suggested-by Ville Syrjälä <[email protected]>
Signed-off-by Matthew Auld <[email protected]>
Cc Joonas Lahtinen <[email protected]>
Cc Ville Syrjälä <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Paulo Zanoni <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc H. Peter Anvin <[email protected]>
Reviewed-by Ville Syrjälä <[email protected]>
--- arch/x86/kernel/early-quirks.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/kernel/early-quirks.c +3 -3
@@ -428,9 +428,9 @@ static resource_size_t __init chv_stolen_size(int num, int slot, int func)if (gms <0x11 )return gms *MB (32 );else if (gms <0x17 ) -return (gms -0x11 +2 ) *MB (4 ); +return (gms -0x11 ) *MB (4 ) +MB (8 );else -return (gms -0x17 +9 ) *MB (4 ); +return (gms -0x17 ) *MB (4 ) +MB (36 ); }static resource_size_t __init gen9_stolen_size (int num,int slot,int func)
@@ -446,7 +446,7 @@ static resource_size_t __init gen9_stolen_size(int num, int slot, int func)if (gms <0xf0 )return gms *MB (32 );else -return (gms -0xf0 +1 ) *MB (4 ); +return (gms -0xf0 ) *MB (4 ) +MB (4 ); }struct intel_early_ops {
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/10 x86/early-quirks: reverse the if ladders
In reply to Matthew AuldMakes things a little easier to follow.
Suggested-by Ville Syrjälä <[email protected]>
Signed-off-by Matthew Auld <[email protected]>
Cc Joonas Lahtinen <[email protected]>
Cc Ville Syrjälä <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Paulo Zanoni <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc H. Peter Anvin <[email protected]>
Reviewed-by Ville Syrjälä <[email protected]>
--- arch/x86/kernel/early-quirks.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
arch/x86/kernel/early-quirks.c +7 -7
@@ -425,12 +425,12 @@ static resource_size_t __init chv_stolen_size(int num, int slot, int func)* 0x11 to 0x16: 4MB increments starting at 8MB * 0x17 to 0x1d: 4MB increments start at 36MB */ -if (gms <0x11 ) -return gms *MB (32 ); -else if (gms <0x17 ) +if (gms >=0x17 ) +return (gms -0x17 ) *MB (4 ) +MB (36 ); +else if (gms >=0x11 )return (gms -0x11 ) *MB (4 ) +MB (8 );else -return (gms -0x17 ) *MB (4 ) +MB (36 ); +return gms *MB (32 ); }static resource_size_t __init gen9_stolen_size (int num,int slot,int func)
@@ -443,10 +443,10 @@ static resource_size_t __init gen9_stolen_size(int num, int slot, int func)/* 0x0 to 0xef: 32MB increments starting at 0MB */ /* 0xf0 to 0xfe: 4MB increments starting at 4MB */ -if (gms <0xf0 ) -return gms *MB (32 ); -else +if (gms >=0xf0 )return (gms -0xf0 ) *MB (4 ) +MB (4 ); +else +return gms *MB (32 ); }struct intel_early_ops {
Signature · 1 line
2.14.3
PATCH 4/10 drm/i915: nuke the duplicated stolen discovery
In reply to Matthew AuldWe duplicate the stolen discovery code in early-quirks and in i915, however now that the stolen region is exported as a resource from early-quirks we can nuke the duplication.
v2: check overflows_type
Signed-off-by Matthew Auld <[email protected]>
Cc Joonas Lahtinen <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Paulo Zanoni <[email protected]>
Reviewed-by Chris Wilson <[email protected]>
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 51 +-------------- drivers/gpu/drm/i915/i915_gem_stolen.c | 109 +-------------------------------- 2 files changed, 5 insertions(+), 155 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +3 -48
@@ -2949,50 +2949,6 @@ static unsigned int chv_get_total_gtt_size(u16 gmch_ctrl)return 0 ; } -static 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 (size_t )snb_gmch_ctl <<25 ;/* 32 MB units */ -} - -static size_t gen8_get_stolen_size (u16 bdw_gmch_ctl) -{ - bdw_gmch_ctl >>=BDW_GMCH_GMS_SHIFT ; - bdw_gmch_ctl &=BDW_GMCH_GMS_MASK ; -return (size_t )bdw_gmch_ctl <<25 ;/* 32 MB units */ -} - -static size_t chv_get_stolen_size (u16 gmch_ctrl) -{ - gmch_ctrl >>=SNB_GMCH_GMS_SHIFT ; - gmch_ctrl &=SNB_GMCH_GMS_MASK ; - -/* -* 0x0 to 0x10: 32MB increments starting at 0MB -* 0x11 to 0x16: 4MB increments starting at 8MB -* 0x17 to 0x1d: 4MB increments start at 36MB -*/ -if (gmch_ctrl <0x11 ) -return (size_t )gmch_ctrl <<25 ; -else if (gmch_ctrl <0x17 ) -return (size_t )(gmch_ctrl -0x11 +2 ) <<22 ; -else -return (size_t )(gmch_ctrl -0x17 +9 ) <<22 ; -} - -static size_t gen9_get_stolen_size (u16 gen9_gmch_ctl) -{ - gen9_gmch_ctl >>=BDW_GMCH_GMS_SHIFT ; - gen9_gmch_ctl &=BDW_GMCH_GMS_MASK ; - -if (gen9_gmch_ctl <0xf0 ) -return (size_t )gen9_gmch_ctl <<25 ;/* 32 MB units */ -else -/* 4MB increments starting at 0xf0 for 4MB */ -return (size_t )(gen9_gmch_ctl -0xf0 +1 ) <<22 ; -} -static int ggtt_probe_common (struct i915_ggtt *ggtt,u64 size) {struct drm_i915_private *dev_priv = ggtt->base.i915;
@@ -3343,14 +3299,13 @@ static int gen8_gmch_probe(struct i915_ggtt *ggtt)pci_read_config_word (pdev,SNB_GMCH_CTRL , &snb_gmch_ctl); + ggtt->stolen_size =resource_size (&intel_graphics_stolen_res); +if (INTEL_GEN (dev_priv) >=9 ) { - ggtt->stolen_size =gen9_get_stolen_size (snb_gmch_ctl); size =gen8_get_total_gtt_size (snb_gmch_ctl); }else if (IS_CHERRYVIEW (dev_priv)) { - ggtt->stolen_size =chv_get_stolen_size (snb_gmch_ctl); size =chv_get_total_gtt_size (snb_gmch_ctl); }else { - ggtt->stolen_size =gen8_get_stolen_size (snb_gmch_ctl); size =gen8_get_total_gtt_size (snb_gmch_ctl); }
@@ -3408,7 +3363,7 @@ static int gen6_gmch_probe(struct i915_ggtt *ggtt)DRM_ERROR ("Can't set DMA mask/consistent mask (%d)\n" , err);pci_read_config_word (pdev,SNB_GMCH_CTRL , &snb_gmch_ctl); - ggtt->stolen_size =gen6_get_stolen_size (snb_gmch_ctl); + ggtt->stolen_size =resource_size (&intel_graphics_stolen_res); size =gen6_get_total_gtt_size (snb_gmch_ctl); ggtt->base.total = (size /sizeof (gen6_pte_t)) <<PAGE_SHIFT ;
drivers/gpu/drm/i915/i915_gem_stolen.c +2 -107
124 lines not on this page · raw message
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/10 drm/i915: make dsm struct resource centric
In reply to Matthew AuldNow that we are using struct resource to track the stolen region, it is more convenient if we track dsm in a resource as well.
v2: check range_overflow when writing to 32b registers (Chris)
pepper in some comments (Chris)
v3: refit i915_stolen_to_dma()
v4: kill ggtt->stolen_size
Signed-off-by Matthew Auld <[email protected]>
Cc Joonas Lahtinen <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Paulo Zanoni <[email protected]>
--- drivers/char/agp/intel-gtt.c | 2 - drivers/gpu/drm/i915/i915_drv.h | 12 +++- drivers/gpu/drm/i915/i915_gem_gtt.c | 8 +-- drivers/gpu/drm/i915/i915_gem_gtt.h | 1 - drivers/gpu/drm/i915/i915_gem_stolen.c | 111 +++++++++++++++------------------ drivers/gpu/drm/i915/intel_fbc.c | 13 ++-- drivers/gpu/drm/i915/intel_pm.c | 15 +++-- include/drm/intel-gtt.h | 1 - 8 files changed, 81 insertions(+), 82 deletions(-)
drivers/char/agp/intel-gtt.c +0 -2
@@ -1422,12 +1422,10 @@ int intel_gmch_probe(struct pci_dev *bridge_pdev, struct pci_dev *gpu_pdev,EXPORT_SYMBOL (intel_gmch_probe);void intel_gtt_get (u64 *gtt_total, -u32 *stolen_size,phys_addr_t *mappable_base,u64 *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 +9 -3
@@ -1537,9 +1537,6 @@ struct i915_gem_mm {*/ struct pagevec wc_stash; -/** Usable portion of the GTT for GEM */ -dma_addr_t stolen_base;/* limited to low memory (32-bit) */ -/** * tmpfs instance used for shmem backed objects */
@@ -2253,6 +2250,15 @@ struct drm_i915_private {const struct intel_device_info info; +/** +* Data Stolen Memory - aka "i915 stolen memory" gives us the start and +* end of stolen which we can optionally use to create GEM objects +* backed by stolen memory. Note that ggtt->stolen_usable_size tells us +* exactly how much of this we are actually allowed to use, given that +* some portion of it is in fact reserved for use by hardware functions. +*/ +struct resource dsm; +void __iomem *regs;struct intel_uncore uncore;
drivers/gpu/drm/i915/i915_gem_gtt.c +2 -6
@@ -3299,8 +3299,6 @@ static int gen8_gmch_probe(struct i915_ggtt *ggtt)pci_read_config_word (pdev,SNB_GMCH_CTRL , &snb_gmch_ctl); - ggtt->stolen_size =resource_size (&intel_graphics_stolen_res); -if (INTEL_GEN (dev_priv) >=9 ) { size =gen8_get_total_gtt_size (snb_gmch_ctl); }else if (IS_CHERRYVIEW (dev_priv)) {
@@ -3363,8 +3361,6 @@ static int gen6_gmch_probe(struct i915_ggtt *ggtt)DRM_ERROR ("Can't set DMA mask/consistent mask (%d)\n" , err);pci_read_config_word (pdev,SNB_GMCH_CTRL , &snb_gmch_ctl); - ggtt->stolen_size =resource_size (&intel_graphics_stolen_res); - size =gen6_get_total_gtt_size (snb_gmch_ctl); ggtt->base.total = (size /sizeof (gen6_pte_t)) <<PAGE_SHIFT ;
@@ -3410,7 +3406,6 @@ static int i915_gmch_probe(struct i915_ggtt *ggtt) }intel_gtt_get (&ggtt->base.total, - &ggtt->stolen_size, &ggtt->mappable_base, &ggtt->mappable_end);
@@ -3482,7 +3477,8 @@ int i915_ggtt_probe_hw(struct drm_i915_private *dev_priv)DRM_INFO ("Memory usable by graphics device = %lluM\n" , ggtt->base.total >>20 );DRM_DEBUG_DRIVER ("GMADR size = %lldM\n" , ggtt->mappable_end >>20 ); -DRM_DEBUG_DRIVER ("GTT stolen size = %uM\n" , ggtt->stolen_size >>20 ); +DRM_DEBUG_DRIVER ("GTT stolen size = %lluM\n" , + (u64 )resource_size (&intel_graphics_stolen_res) >>20 );if (intel_vtd_active ())DRM_INFO ("VT-d active for gfx access\n" );
drivers/gpu/drm/i915/i915_gem_gtt.h +0 -1
@@ -381,7 +381,6 @@ struct i915_ggtt {* avoid the first page! The upper end of stolen memory is reserved for * hardware functions and similarly removed from the accessible range. */ -u32 stolen_size;/* Total size of stolen memory */ u32 stolen_usable_size;/* Total size minus reserved ranges */ u32 stolen_reserved_base;u32 stolen_reserved_size;
drivers/gpu/drm/i915/i915_gem_stolen.c +52 -59
230 lines not on this page · raw message
drivers/gpu/drm/i915/intel_fbc.c +9 -4
@@ -531,7 +531,6 @@ static int find_compression_threshold(struct drm_i915_private *dev_priv, int size, int fb_cpp) { -struct i915_ggtt *ggtt = &dev_priv->ggtt;int compression_threshold =1 ;int ret;u64 end;
@@ -541,7 +540,7 @@ static int find_compression_threshold(struct drm_i915_private *dev_priv,* If we enable FBC using a CFB on that memory range we'll get FIFO * underruns, even if that range is not reserved by the BIOS. */ if (IS_BROADWELL (dev_priv) ||IS_GEN9_BC (dev_priv)) - end = ggtt->stolen_size -8 *1024 *1024 ; + end =resource_size (&dev_priv->dsm) -8 *1024 *1024 ;else end =U64_MAX ;
@@ -615,10 +614,16 @@ static int intel_fbc_alloc_cfb(struct intel_crtc *crtc) fbc->compressed_llb = compressed_llb; +GEM_BUG_ON (range_overflows_t (u64, dev_priv->dsm.start, + fbc->compressed_fb.start, +U32_MAX )); +GEM_BUG_ON (range_overflows_t (u64, dev_priv->dsm.start, + fbc->compressed_llb->start, +U32_MAX ));I915_WRITE (FBC_CFB_BASE , - dev_priv->mm.stolen_base + fbc->compressed_fb.start); + dev_priv->dsm.start + fbc->compressed_fb.start);I915_WRITE (FBC_LL_BASE , - dev_priv->mm.stolen_base + compressed_llb->start); + dev_priv->dsm.start + compressed_llb->start); } DRM_DEBUG_KMS("reserved %llu bytes of contiguous stolen space for FBC, threshold: %d\n",
drivers/gpu/drm/i915/intel_pm.c +9 -6
@@ -7020,7 +7020,7 @@ static void valleyview_check_pctx(struct drm_i915_private *dev_priv) {unsigned long pctx_addr =I915_READ (VLV_PCBR ) & ~4095 ; -WARN_ON (pctx_addr != dev_priv->mm.stolen_base + +WARN_ON (pctx_addr != dev_priv->dsm.start + dev_priv->vlv_pctx->stolen->start); }
@@ -7035,7 +7035,6 @@ static void cherryview_check_pctx(struct drm_i915_private *dev_priv)static void cherryview_setup_pctx (struct drm_i915_private *dev_priv) { -struct i915_ggtt *ggtt = &dev_priv->ggtt;unsigned long pctx_paddr, paddr;u32 pcbr;int pctx_size =32 *1024 ;
@@ -7043,8 +7042,8 @@ static void cherryview_setup_pctx(struct drm_i915_private *dev_priv) pcbr =I915_READ (VLV_PCBR );if ((pcbr >>VLV_PCBR_ADDR_SHIFT ) ==0 ) {DRM_DEBUG_DRIVER ("BIOS didn't set up PCBR, fixing up\n" ); - paddr = (dev_priv->mm.stolen_base + - (ggtt->stolen_size - pctx_size)); + paddr = dev_priv->dsm.end +1 - pctx_size; +GEM_BUG_ON (paddr >U32_MAX ); pctx_paddr = (paddr & (~4095 ));I915_WRITE (VLV_PCBR , pctx_paddr);
@@ -7065,7 +7064,7 @@ static void valleyview_setup_pctx(struct drm_i915_private *dev_priv)/* BIOS set it up already, grab the pre-alloc'd space */ int pcbr_offset; - pcbr_offset = (pcbr & (~4095 )) - dev_priv->mm.stolen_base; + pcbr_offset = (pcbr & (~4095 )) - dev_priv->dsm.start; pctx = i915_gem_object_create_stolen_for_preallocated(dev_priv, pcbr_offset, I915_GTT_OFFSET_NONE,
@@ -7089,7 +7088,11 @@ static void valleyview_setup_pctx(struct drm_i915_private *dev_priv) goto out; } - pctx_paddr = dev_priv->mm.stolen_base + pctx->stolen->start; +GEM_BUG_ON (range_overflows_t (u64, + dev_priv->dsm.start, + pctx->stolen->start, +U32_MAX )); + pctx_paddr = dev_priv->dsm.start + pctx->stolen->start;I915_WRITE (VLV_PCBR , pctx_paddr); out:
include/drm/intel-gtt.h +0 -1
@@ -5,7 +5,6 @@#define _DRM_INTEL_GTT_Hvoid intel_gtt_get (u64 *gtt_total, -u32 *stolen_size,phys_addr_t *mappable_base,u64 *mappable_end);
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 05/10] drm/i915: make dsm struct resource centric
Quoting Matthew Auld (2017-12-06 18:17:25)
Quoted 13 lines
Now that we are using struct resource to track the stolen region, it is more convenient if we track dsm in a resource as well.
v2: check
range_overflowwhen writing to 32b registers (Chris)
pepper in some comments (Chris)
v3: refiti915_stolen_to_dma()
v4: killggtt->stolen_sizeSigned-off-by Matthew Auld <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Chris Wilson <[email protected]>Cc Paulo Zanoni <[email protected]>---
drivers/gpu/drm/i915/i915_gem_stolen.c void i915_gem_stolen_remove_node(struct drm_i915_private *dev_priv, · line 85
Quoted 10 lines
drivers/gpu/drm/i915/i915_gem_stolen.c +3
-3-static dma_addr_t i915_stolen_to_dma (struct drm_i915_private *dev_priv) +static int i915_adjust_stolen (struct drm_i915_private *dev_priv, +struct resource *dsm) {struct i915_ggtt *ggtt = &dev_priv->ggtt; -dma_addr_t base = intel_graphics_stolen_res.start;struct resource *r; -GEM_BUG_ON (overflows_type (intel_graphics_stolen_res.start, base)); +if (dsm->start ==0 ||add_overflows (dsm->start,resource_size (dsm)))
Now s/add_overflows/dsm->end <= dsm->start/
Quoted 7 lines
drivers/gpu/drm/i915/i915_gem_stolen.c +2
-4+return -EINVAL ; -if (base ==0 ||add_overflows (base, ggtt->stolen_size)) -return 0 ; - -/* make sure we don't clobber the GTT if it's within stolen memory */ +/* Make sure we don't clobber the GTT if it's within stolen memory */
drivers/gpu/drm/i915/i915_gem_stolen.c void i915_gem_stolen_remove_node(struct drm_i915_private *dev_priv, · line 93
Quoted 10 lines
drivers/gpu/drm/i915/i915_gem_stolen.c +3
-5if (INTEL_GEN (dev_priv) <=4 && !IS_G33 (dev_priv) && !IS_PINEVIEW (dev_priv) && !IS_G4X (dev_priv)) { -struct { -dma_addr_t start, end; - } stolen[2 ] = { - { .start = base, .end = base + ggtt->stolen_size, }, - { .start = base, .end = base + ggtt->stolen_size, }, +struct resource stolen[2 ] = { +DEFINE_RES_MEM (dsm->start,resource_size (dsm)), +DEFINE_RES_MEM (dsm->start,resource_size (dsm)),
struct resource stolen[2] = { *dsm, *dsm } ?
Quoted 4 lines
};drivers/gpu/drm/i915/i915_gem_stolen.c +2
-1-u64 ggtt_start, ggtt_end; +struct resource ggtt_res; +u64 ggtt_start;
drivers/gpu/drm/i915/i915_gem_stolen.c static dma_addr_t i915_stolen_to_dma(struct drm_i915_private *dev_priv) · line 134
Quoted 10 lines
drivers/gpu/drm/i915/i915_gem_stolen.c +2
-1/* Verify that nothing else uses this physical address. Stolen * memory should be reserved by the BIOS and hidden from the * kernel. So if the region is already marked as busy, something * is seriously wrong. */ - r =devm_request_mem_region (dev_priv->drm.dev, base, ggtt->stolen_size, + r =devm_request_mem_region (dev_priv->drm.dev, dsm->start, +resource_size (dsm),"Graphics Stolen Memory" );
A future task is that we really don't need the allocation here anymore, and should be able to reserve the resource directly.
Quoted 8 lines
drivers/gpu/drm/i915/i915_gem_stolen.c +1
-1@@ -351,14 +339,18 @@ int i915_gem_init_stolen(struct drm_i915_private *dev_priv)return 0 ; } -if (ggtt->stolen_size ==0 ) +if (resource_size (&intel_graphics_stolen_res) ==0 )return 0 ;
drivers/gpu/drm/i915/i915_gem_stolen.c int i915_gem_init_stolen(struct drm_i915_private *dev_priv) · line 351
Quoted 10 lines
drivers/gpu/drm/i915/i915_gem_stolen.c +5
-3- dev_priv->mm.stolen_base =i915_stolen_to_dma (dev_priv); -if (dev_priv->mm.stolen_base ==0 ) + dev_priv->dsm = intel_graphics_stolen_res; + +if (i915_adjust_stolen (dev_priv, &dev_priv->dsm))return 0 ; - stolen_top = dev_priv->mm.stolen_base + ggtt->stolen_size; +GEM_BUG_ON (dev_priv->dsm.start ==0 ); +GEM_BUG_ON (resource_size (&dev_priv->dsm) ==0 );
GEM_BUG_ON(dsm.end <= dsm.start); instead of size == 0
Quoted 7 lines
drivers/gpu/drm/i915/i915_gem_stolen.c +2
-0+ + stolen_top = dev_priv->dsm.end +1 ; reserved_base =0 ; reserved_size =0 ;@@ -399,12 +391,12 @@ int i915_gem_init_stolen(struct drm_i915_private *dev_priv) reserved_base = stolen_top;
drivers/gpu/drm/i915/i915_gem_stolen.c int i915_gem_init_stolen(struct drm_i915_private *dev_priv) · line 399
Quoted 10 lines
drivers/gpu/drm/i915/i915_gem_stolen.c +2
-2} -if (reserved_base < dev_priv->mm.stolen_base || +if (reserved_base < dev_priv->dsm.start || reserved_base + reserved_size > stolen_top) {dma_addr_t reserved_top = reserved_base + reserved_size;DRM_ERROR ("Stolen reserved area [%pad - %pad] outside stolen memory [%pad - %pad]\n" , &reserved_base, &reserved_top, - &dev_priv->mm.stolen_base, &stolen_top); + &dev_priv->dsm.start, &stolen_top);
%pR here?
Reviewed-by Chris Wilson <[email protected]>
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 05/10] drm/i915: make dsm struct resource centric
Quoted 45 lines · Chris Wilson
Quoting Matthew Auld (2017-12-06 18:17:25)
Quoted 13 lines
Now that we are using struct resource to track the stolen region, it is more convenient if we track dsm in a resource as well.
v2: check
range_overflowwhen writing to 32b registers (Chris)
pepper in some comments (Chris)
v3: refiti915_stolen_to_dma()
v4: killggtt->stolen_sizeSigned-off-by Matthew Auld <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Chris Wilson <[email protected]>Cc Paulo Zanoni <[email protected]>---
drivers/gpu/drm/i915/i915_gem_stolen.c void i915_gem_stolen_remove_node(struct drm_i915_private *dev_priv, · line 85
Quoted 10 lines
drivers/gpu/drm/i915/i915_gem_stolen.c +3
-3-static dma_addr_t i915_stolen_to_dma (struct drm_i915_private *dev_priv) +static int i915_adjust_stolen (struct drm_i915_private *dev_priv, +struct resource *dsm) {struct i915_ggtt *ggtt = &dev_priv->ggtt; -dma_addr_t base = intel_graphics_stolen_res.start;struct resource *r; -GEM_BUG_ON (overflows_type (intel_graphics_stolen_res.start, base)); +if (dsm->start ==0 ||add_overflows (dsm->start,resource_size (dsm)))Now s/add_overflows/dsm->end <= dsm->start/
Quoted 7 lines
drivers/gpu/drm/i915/i915_gem_stolen.c +2
-4+return -EINVAL ; -if (base ==0 ||add_overflows (base, ggtt->stolen_size)) -return 0 ; - -/* make sure we don't clobber the GTT if it's within stolen memory */ +/* Make sure we don't clobber the GTT if it's within stolen memory */ drivers/gpu/drm/i915/i915_gem_stolen.c void i915_gem_stolen_remove_node(struct drm_i915_private *dev_priv, · line 93
Quoted 10 lines
drivers/gpu/drm/i915/i915_gem_stolen.c +3
-5if (INTEL_GEN (dev_priv) <=4 && !IS_G33 (dev_priv) && !IS_PINEVIEW (dev_priv) && !IS_G4X (dev_priv)) { -struct { -dma_addr_t start, end; - } stolen[2 ] = { - { .start = base, .end = base + ggtt->stolen_size, }, - { .start = base, .end = base + ggtt->stolen_size, }, +struct resource stolen[2 ] = { +DEFINE_RES_MEM (dsm->start,resource_size (dsm)), +DEFINE_RES_MEM (dsm->start,resource_size (dsm)),
Quoted 1 line
struct resource stolen[2] = { *dsm, *dsm } ?
BTW I don't think I've ever seen a case where the GTT wasn't at the end of stolen. So we could simplify this code by making that assumption.
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/10 drm/i915: make reserved struct resource centric
In reply to Matthew AuldNow that we are using struct resource to track the stolen region, it is more convenient if we track the reserved portion of that region in a resource as well.
v2: s/<= end + 1/< end/ (Chris)
v3: prefer DEFINE_RES_MEM
Signed-off-by Matthew Auld <[email protected]>
Cc Joonas Lahtinen <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Paulo Zanoni <[email protected]>
Reviewed-by Chris Wilson <[email protected]>
--- drivers/gpu/drm/i915/i915_drv.h | 4 ++++ drivers/gpu/drm/i915/i915_gem_gtt.h | 2 -- drivers/gpu/drm/i915/i915_gem_stolen.c | 15 ++++++--------- drivers/gpu/drm/i915/intel_pm.c | 6 ++---- 4 files changed, 12 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +4 -0
@@ -2258,6 +2258,10 @@ struct drm_i915_private {* some portion of it is in fact reserved for use by hardware functions. */ struct resource dsm; +/** +* Reseved portion of Data Stolen Memory +*/ +struct resource dsm_reserved;void __iomem *regs;
drivers/gpu/drm/i915/i915_gem_gtt.h +0 -2
@@ -382,8 +382,6 @@ struct i915_ggtt {* hardware functions and similarly removed from the accessible range. */ u32 stolen_usable_size;/* Total size minus reserved ranges */ -u32 stolen_reserved_base; -u32 stolen_reserved_size;/** "Graphics Stolen Memory" holds the global PTEs */ void __iomem *gsm;
drivers/gpu/drm/i915/i915_gem_stolen.c +6 -9
@@ -391,18 +391,15 @@ int i915_gem_init_stolen(struct drm_i915_private *dev_priv) reserved_base = stolen_top; } -if (reserved_base < dev_priv->dsm.start || - reserved_base + reserved_size > stolen_top) { -dma_addr_t reserved_top = reserved_base + reserved_size; -DRM_ERROR ("Stolen reserved area [%pad - %pad] outside stolen memory [%pad - %pad]\n" , - &reserved_base, &reserved_top, - &dev_priv->dsm.start, &stolen_top); + dev_priv->dsm_reserved = + (struct resource )DEFINE_RES_MEM (reserved_base, reserved_size); + +if (!resource_contains (&dev_priv->dsm, &dev_priv->dsm_reserved)) { +DRM_ERROR ("Stolen reserved area %pR outside stolen memory %pR\n" , + &dev_priv->dsm_reserved, &dev_priv->dsm);return 0 ; } - ggtt->stolen_reserved_base = reserved_base; - ggtt->stolen_reserved_size = reserved_size; -/* It is possible for the reserved area to end before the end of stolen * memory, so just consider the start. */ reserved_total = stolen_top - reserved_base;
drivers/gpu/drm/i915/intel_pm.c +2 -4
@@ -6416,7 +6416,6 @@ static void valleyview_disable_rps(struct drm_i915_private *dev_priv)static bool bxt_check_bios_rc6_setup (struct drm_i915_private *dev_priv) { -struct i915_ggtt *ggtt = &dev_priv->ggtt;bool enable_rc6 = true;unsigned long rc6_ctx_base;u32 rc_ctl;
@@ -6441,9 +6440,8 @@ static bool bxt_check_bios_rc6_setup(struct drm_i915_private *dev_priv)* for this check. */ rc6_ctx_base =I915_READ (RC6_CTX_BASE ) &RC6_CTX_BASE_MASK ; -if (!((rc6_ctx_base >= ggtt->stolen_reserved_base) && - (rc6_ctx_base +PAGE_SIZE <= ggtt->stolen_reserved_base + - ggtt->stolen_reserved_size))) { +if (!((rc6_ctx_base >= dev_priv->dsm_reserved.start) && + (rc6_ctx_base +PAGE_SIZE < dev_priv->dsm_reserved.end))) {DRM_DEBUG_DRIVER ("RC6 Base address not as expected.\n" ); enable_rc6 = false; }
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 7/10 drm/i915: make mappable struct resource centric
In reply to Matthew AuldNow that we are using struct resource to track the stolen region, it is more convenient if we track the mappable region in a resource as well.
v2: prefer iomap and gmadr naming scheme
prefer DEFINE_RES_MEM
Signed-off-by Matthew Auld <[email protected]>
Cc Joonas Lahtinen <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Paulo Zanoni <[email protected]>
Reviewed-by Chris Wilson <[email protected]>
--- drivers/gpu/drm/i915/gvt/gvt.h | 2 +- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_gem.c | 8 ++++---- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 29 ++++++++++++++++++--------- drivers/gpu/drm/i915/i915_gem_gtt.h | 4 ++-- drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- drivers/gpu/drm/i915/i915_vma.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 2 +- drivers/gpu/drm/i915/intel_overlay.c | 4 ++-- drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 4 ++-- drivers/gpu/drm/i915/selftests/mock_gtt.c | 4 ++-- 12 files changed, 37 insertions(+), 28 deletions(-)
drivers/gpu/drm/i915/gvt/gvt.h +1 -1
@@ -348,7 +348,7 @@ int intel_gvt_load_firmware(struct intel_gvt *gvt);/* Aperture/GM space definitions for GVT device */ #define gvt_aperture_sz (gvt) (gvt->dev_priv->ggtt.mappable_end) -#define gvt_aperture_pa_base (gvt) (gvt->dev_priv->ggtt.mappable_base) +#define gvt_aperture_pa_base (gvt) (gvt->dev_priv->ggtt.gmadr.start)#define gvt_ggtt_gm_sz (gvt) (gvt->dev_priv->ggtt.base.total)#define gvt_ggtt_sz (gvt) \
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -726,7 +726,7 @@ static int i915_kick_out_firmware_fb(struct drm_i915_private *dev_priv)if (!ap)return -ENOMEM ; - ap->ranges[0 ].base = ggtt->mappable_base; + ap->ranges[0 ].base = ggtt->gmadr.start; ap->ranges[0 ].size = ggtt->mappable_end; primary =
drivers/gpu/drm/i915/i915_gem.c +4 -4
@@ -1099,7 +1099,7 @@ i915_gem_gtt_pread(struct drm_i915_gem_object *obj, page_base += offset &PAGE_MASK ; } -if (gtt_user_read (&ggtt->mappable, page_base, page_offset, +if (gtt_user_read (&ggtt->iomap, page_base, page_offset, user_data, page_length)) { ret = -EFAULT ;break ;
@@ -1307,7 +1307,7 @@ i915_gem_gtt_pwrite_fast(struct drm_i915_gem_object *obj,* If the object is non-shmem backed, we retry again with the * path that handles page fault. */ -if (ggtt_write (&ggtt->mappable, page_base, page_offset, +if (ggtt_write (&ggtt->iomap, page_base, page_offset, user_data, page_length)) { ret = -EFAULT ;break ;
@@ -1953,9 +1953,9 @@ int i915_gem_fault(struct vm_fault *vmf)/* Finally, remap it using the new GTT offset */ ret =remap_io_mapping (area, area->vm_start + (vma->ggtt_view.partial.offset <<PAGE_SHIFT ), - (ggtt->mappable_base + vma->node.start) >>PAGE_SHIFT , + (ggtt->gmadr.start + vma->node.start) >>PAGE_SHIFT ,min_t (u64, vma->size, area->vm_end - area->vm_start), - &ggtt->mappable); + &ggtt->iomap);if (ret) goto err_fence;
drivers/gpu/drm/i915/i915_gem_execbuffer.c +1 -1
@@ -1012,7 +1012,7 @@ static void *reloc_iomap(struct drm_i915_gem_object *obj, offset += page <<PAGE_SHIFT ; } - vaddr = (void __force *)io_mapping_map_atomic_wc (&ggtt->mappable, + vaddr = (void __force *)io_mapping_map_atomic_wc (&ggtt->iomap, offset); cache->page = page; cache->vaddr = (unsigned long )vaddr;
drivers/gpu/drm/i915/i915_gem_gtt.c +19 -10
@@ -2912,7 +2912,7 @@ void i915_ggtt_cleanup_hw(struct drm_i915_private *dev_priv)mutex_unlock (&dev_priv->drm.struct_mutex);arch_phys_wc_del (ggtt->mtrr); -io_mapping_fini (&ggtt->mappable); +io_mapping_fini (&ggtt->iomap); }static unsigned int gen6_get_total_gtt_size (u16 snb_gmch_ctl)
@@ -3288,8 +3288,10 @@ static int gen8_gmch_probe(struct i915_ggtt *ggtt)int err;/* TODO: We're not aware of mappable constraints on gen8 yet */ - ggtt->mappable_base =pci_resource_start (pdev,2 ); - ggtt->mappable_end =pci_resource_len (pdev,2 ); + ggtt->gmadr = + (struct resource )DEFINE_RES_MEM (pci_resource_start (pdev,2 ), +pci_resource_len (pdev,2 )); + ggtt->mappable_end =resource_size (&ggtt->gmadr); err =pci_set_dma_mask (pdev,DMA_BIT_MASK (39 ));if (!err)
@@ -3343,8 +3345,10 @@ static int gen6_gmch_probe(struct i915_ggtt *ggtt)u16 snb_gmch_ctl;int err; - ggtt->mappable_base =pci_resource_start (pdev,2 ); - ggtt->mappable_end =pci_resource_len (pdev,2 ); + ggtt->gmadr = + (struct resource )DEFINE_RES_MEM (pci_resource_start (pdev,2 ), +pci_resource_len (pdev,2 )); + ggtt->mappable_end =resource_size (&ggtt->gmadr);/* 64/512MB is the current min/max we actually know of, but this is just * a coarse sanity check.
@@ -3397,6 +3401,7 @@ static void i915_gmch_remove(struct i915_address_space *vm)static int i915_gmch_probe (struct i915_ggtt *ggtt) {struct drm_i915_private *dev_priv = ggtt->base.i915; +phys_addr_t gmadr_base;int ret; ret =intel_gmch_probe (dev_priv->bridge_dev, dev_priv->drm.pdev,NULL );
@@ -3406,9 +3411,13 @@ static int i915_gmch_probe(struct i915_ggtt *ggtt) }intel_gtt_get (&ggtt->base.total, - &ggtt->mappable_base, + &gmadr_base, &ggtt->mappable_end); + ggtt->gmadr = + (struct resource )DEFINE_RES_MEM (gmadr_base, + ggtt->mappable_end); + ggtt->do_idle_maps =needs_idle_maps (dev_priv); ggtt->base.insert_page = i915_ggtt_insert_page; ggtt->base.insert_entries = i915_ggtt_insert_entries;
@@ -3476,7 +3485,7 @@ int i915_ggtt_probe_hw(struct drm_i915_private *dev_priv)/* GMADR is the PCI mmio aperture into the global GTT. */ DRM_INFO ("Memory usable by graphics device = %lluM\n" , ggtt->base.total >>20 ); -DRM_DEBUG_DRIVER ("GMADR size = %lldM\n" , ggtt->mappable_end >>20 ); +DRM_DEBUG_DRIVER ("GMADR size = %lluM\n" , (u64 )ggtt->mappable_end >>20 );DRM_DEBUG_DRIVER ("GTT stolen size = %lluM\n" , (u64 )resource_size (&intel_graphics_stolen_res) >>20 );if (intel_vtd_active ())
@@ -3507,14 +3516,14 @@ int i915_ggtt_init_hw(struct drm_i915_private *dev_priv) ggtt->base.mm.color_adjust = i915_gtt_color_adjust;mutex_unlock (&dev_priv->drm.struct_mutex); -if (!io_mapping_init_wc (&dev_priv->ggtt.mappable, - dev_priv->ggtt.mappable_base, +if (!io_mapping_init_wc (&dev_priv->ggtt.iomap, + dev_priv->ggtt.gmadr.start, dev_priv->ggtt.mappable_end)) { ret = -EIO ; goto out_gtt_cleanup; } - ggtt->mtrr =arch_phys_wc_add (ggtt->mappable_base, ggtt->mappable_end); + ggtt->mtrr =arch_phys_wc_add (ggtt->gmadr.start, ggtt->mappable_end);/* * Initialise stolen early so that we may reserve preallocated
drivers/gpu/drm/i915/i915_gem_gtt.h +2 -2
@@ -368,9 +368,9 @@ i915_vm_has_scratch_64K(struct i915_address_space *vm)*/ struct i915_ggtt {struct i915_address_space base; -struct io_mapping mappable;/* Mapping to our CPU mappable region */ -phys_addr_t mappable_base;/* PA of our GMADR */ +struct io_mapping iomap;/* Mapping to our CPU mappable region */ +struct resource gmadr;/* GMADR resource */ u64 mappable_end;/* End offset that we can CPU map */ /* Stolen memory is segmented in hardware with different portions
drivers/gpu/drm/i915/i915_gpu_error.c +1 -1
@@ -956,7 +956,7 @@ i915_error_object_create(struct drm_i915_private *i915, ggtt->base.insert_page (&ggtt->base, dma, slot,I915_CACHE_NONE ,0 ); - s =io_mapping_map_atomic_wc (&ggtt->mappable, slot); + s =io_mapping_map_atomic_wc (&ggtt->iomap, slot); ret =compress_page (&compress, (void __force *)s, dst);io_mapping_unmap_atomic (s);
drivers/gpu/drm/i915/i915_vma.c +1 -1
@@ -305,7 +305,7 @@ void __iomem *i915_vma_pin_iomap(struct i915_vma *vma) ptr = vma->iomap;if (ptr ==NULL ) { - ptr =io_mapping_map_wc (&i915_vm_to_ggtt (vma->vm)->mappable, + ptr =io_mapping_map_wc (&i915_vm_to_ggtt (vma->vm)->iomap, vma->node.start, vma->node.size);if (ptr ==NULL ) {
drivers/gpu/drm/i915/intel_display.c +1 -1
@@ -14621,7 +14621,7 @@ int intel_modeset_init(struct drm_device *dev) dev->mode_config.cursor_height =MAX_CURSOR_HEIGHT ; } - dev->mode_config.fb_base = ggtt->mappable_base; + dev->mode_config.fb_base = ggtt->gmadr.start; DRM_DEBUG_KMS("%d display pipe%s available.\n", INTEL_INFO(dev_priv)->num_pipes,
drivers/gpu/drm/i915/intel_overlay.c +2 -2
@@ -219,7 +219,7 @@ intel_overlay_map_regs(struct intel_overlay *overlay)if (OVERLAY_NEEDS_PHYSICAL (dev_priv)) regs = (struct overlay_registers __iomem *)overlay->reg_bo->phys_handle->vaddr;else - regs =io_mapping_map_wc (&dev_priv->ggtt.mappable, + regs =io_mapping_map_wc (&dev_priv->ggtt.iomap, overlay->flip_addr,PAGE_SIZE );
@@ -1508,7 +1508,7 @@ intel_overlay_map_regs_atomic(struct intel_overlay *overlay) regs = (struct overlay_registers __iomem *) overlay->reg_bo->phys_handle->vaddr; else - regs =io_mapping_map_atomic_wc (&dev_priv->ggtt.mappable, + regs =io_mapping_map_atomic_wc (&dev_priv->ggtt.iomap, overlay->flip_addr);return regs;
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +2 -2
@@ -1074,7 +1074,7 @@ static int igt_ggtt_page(void *arg)i915_gem_object_get_dma_address (obj,0 ), offset, I915_CACHE_NONE, 0); - vaddr =io_mapping_map_atomic_wc (&ggtt->mappable, offset); + vaddr =io_mapping_map_atomic_wc (&ggtt->iomap, offset);iowrite32 (n, vaddr + n);io_mapping_unmap_atomic (vaddr);
@@ -1092,7 +1092,7 @@ static int igt_ggtt_page(void *arg)i915_gem_object_get_dma_address (obj,0 ), offset, I915_CACHE_NONE, 0); - vaddr =io_mapping_map_atomic_wc (&ggtt->mappable, offset); + vaddr =io_mapping_map_atomic_wc (&ggtt->iomap, offset); val =ioread32 (vaddr + n);io_mapping_unmap_atomic (vaddr);
drivers/gpu/drm/i915/selftests/mock_gtt.c +2 -2
@@ -110,8 +110,8 @@ void mock_init_ggtt(struct drm_i915_private *i915) ggtt->base.i915 = i915; - ggtt->mappable_base =0 ; - ggtt->mappable_end =2048 *PAGE_SIZE ; + ggtt->gmadr = (struct resource )DEFINE_RES_MEM (0 ,2048 *PAGE_SIZE ); + ggtt->mappable_end =resource_size (&ggtt->gmadr); ggtt->base.total =4096 *PAGE_SIZE ; ggtt->base.clear_range = nop_clear_range;
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 8/10 drm/i915: give stolen_usable_size a more suitable home
In reply to Matthew AuldKick it out of i915_ggtt and keep it grouped with dsm and dsm_reserved, where it makes the most sense.
Signed-off-by Matthew Auld <[email protected]>
Cc Joonas Lahtinen <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Paulo Zanoni <[email protected]>
--- drivers/gpu/drm/i915/i915_drv.h | 12 +++++++++++- drivers/gpu/drm/i915/i915_gem_gtt.h | 10 ---------- drivers/gpu/drm/i915/i915_gem_stolen.c | 5 ++--- drivers/gpu/drm/i915/intel_display.c | 3 +-- drivers/gpu/drm/i915/intel_fbdev.c | 3 +-- 5 files changed, 15 insertions(+), 18 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +11 -1
@@ -2253,7 +2253,7 @@ struct drm_i915_private {/** * Data Stolen Memory - aka "i915 stolen memory" gives us the start and * end of stolen which we can optionally use to create GEM objects -* backed by stolen memory. Note that ggtt->stolen_usable_size tells us +* backed by stolen memory. Note that stolen_usable_size tells us * exactly how much of this we are actually allowed to use, given that * some portion of it is in fact reserved for use by hardware functions. */
@@ -2263,6 +2263,16 @@ struct drm_i915_private {*/ struct resource dsm_reserved; +/* Stolen memory is segmented in hardware with different portions +* offlimits to certain functions. +* +* The drm_mm is initialised to the total accessible range, as found +* from the PCI config. On Broadwell+, this is further restricted to +* avoid the first page! The upper end of stolen memory is reserved for +* hardware functions and similarly removed from the accessible range. +*/ +u32 stolen_usable_size;/* Total size minus reserved ranges */ +void __iomem *regs;struct intel_uncore uncore;
drivers/gpu/drm/i915/i915_gem_gtt.h +0 -10
@@ -373,16 +373,6 @@ struct i915_ggtt {struct resource gmadr;/* GMADR resource */ u64 mappable_end;/* End offset that we can CPU map */ -/* Stolen memory is segmented in hardware with different portions -* offlimits to certain functions. -* -* The drm_mm is initialised to the total accessible range, as found -* from the PCI config. On Broadwell+, this is further restricted to -* avoid the first page! The upper end of stolen memory is reserved for -* hardware functions and similarly removed from the accessible range. -*/ -u32 stolen_usable_size;/* Total size minus reserved ranges */ -/** "Graphics Stolen Memory" holds the global PTEs */ void __iomem *gsm;void (*invalidate)(struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/i915_gem_stolen.c +2 -3
@@ -322,7 +322,6 @@ static void bdw_get_stolen_reserved(struct drm_i915_private *dev_priv,int i915_gem_init_stolen (struct drm_i915_private *dev_priv) { -struct i915_ggtt *ggtt = &dev_priv->ggtt;dma_addr_t reserved_base, stolen_top;u32 reserved_total, reserved_size;u32 stolen_usable_start;
@@ -413,12 +412,12 @@ int i915_gem_init_stolen(struct drm_i915_private *dev_priv)if (INTEL_GEN (dev_priv) >=8 ) stolen_usable_start =4096 ; - ggtt->stolen_usable_size = + dev_priv->stolen_usable_size =resource_size (&dev_priv->dsm) - reserved_total - stolen_usable_start;/* Basic memrange allocator for stolen space. */ drm_mm_init (&dev_priv->mm.stolen, stolen_usable_start, - ggtt->stolen_usable_size); + dev_priv->stolen_usable_size);return 0 ; }
drivers/gpu/drm/i915/intel_display.c +1 -2
@@ -2639,7 +2639,6 @@ intel_alloc_initial_plane_obj(struct intel_crtc *crtc, {struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -struct i915_ggtt *ggtt = &dev_priv->ggtt;struct drm_i915_gem_object *obj =NULL ;struct drm_mode_fb_cmd2 mode_cmd = {0 };struct drm_framebuffer *fb = &plane_config->fb->base;
@@ -2655,7 +2654,7 @@ intel_alloc_initial_plane_obj(struct intel_crtc *crtc,/* If the FB is too big, just don't use it since fbdev is not very * important and we should probably use that space with FBC or other * features. */ -if (size_aligned *2 > ggtt->stolen_usable_size) +if (size_aligned *2 > dev_priv->stolen_usable_size)return false;mutex_lock (&dev->struct_mutex);
drivers/gpu/drm/i915/intel_fbdev.c +1 -2
@@ -115,7 +115,6 @@ static int intelfb_alloc(struct drm_fb_helper *helper,struct drm_framebuffer *fb;struct drm_device *dev = helper->dev;struct drm_i915_private *dev_priv =to_i915 (dev); -struct i915_ggtt *ggtt = &dev_priv->ggtt;struct drm_mode_fb_cmd2 mode_cmd = {};struct drm_i915_gem_object *obj;int size, ret;
@@ -139,7 +138,7 @@ static int intelfb_alloc(struct drm_fb_helper *helper,* important and we should probably use that space with FBC or other * features. */ obj =NULL ; -if (size *2 < ggtt->stolen_usable_size) +if (size *2 < dev_priv->stolen_usable_size) obj =i915_gem_object_create_stolen (dev_priv, size);if (obj ==NULL ) obj =i915_gem_object_create (dev_priv, size);
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 08/10] drm/i915: give stolen_usable_size a more suitable home
Quoting Matthew Auld (2017-12-06 18:17:28)
Quoted 29 lines
Kick it out of
i915_ggttand keep it grouped with dsm anddsm_reserved, where it makes the most sense.Signed-off-by Matthew Auld <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Chris Wilson <[email protected]>Cc Paulo Zanoni <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 12 +++++++++++- drivers/gpu/drm/i915/i915_gem_gtt.h | 10 ---------- drivers/gpu/drm/i915/i915_gem_stolen.c | 5 ++--- drivers/gpu/drm/i915/intel_display.c | 3 +-- drivers/gpu/drm/i915/intel_fbdev.c | 3 +-- 5 files changed, 15 insertions(+), 18 deletions(-)drivers/gpu/drm/i915/i915_drv.h +1
-1@@ -2253,7 +2253,7 @@ struct drm_i915_private {/** * Data Stolen Memory - aka "i915 stolen memory" gives us the start and * end of stolen which we can optionally use to create GEM objects -* backed by stolen memory. Note that ggtt->stolen_usable_size tells us +* backed by stolen memory. Note that stolen_usable_size tells us * exactly how much of this we are actually allowed to use, given that * some portion of it is in fact reserved for use by hardware functions. */
drivers/gpu/drm/i915/i915_drv.h struct drm_i915_private { · line 2266
Quoted 4 lines
drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -2263,6 +2263,16 @@ struct drm_i915_private {*/ struct resource dsm_reserved; +/* Stolen memory is segmented in hardware with different portions
/*
* Stolen...
*/
Reviewed-by Chris Wilson <[email protected]>
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 9/10 drm/i915: prefer resource_size_t for everything stolen
In reply to Matthew AuldKeeps things consistent now that we make use of struct resource. This should keep us covered in case we ever get huge amounts of stolen memory.
v2: bunch of missing conversions (Chris)
Signed-off-by Matthew Auld <[email protected]>
Cc Joonas Lahtinen <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Paulo Zanoni <[email protected]>
--- drivers/char/agp/intel-gtt.c | 12 +++++----- drivers/gpu/drm/i915/i915_debugfs.c | 4 ++-- drivers/gpu/drm/i915/i915_drv.h | 11 +++++----- drivers/gpu/drm/i915/i915_gem_gtt.c | 10 ++++----- drivers/gpu/drm/i915/i915_gem_gtt.h | 2 +- drivers/gpu/drm/i915/i915_gem_stolen.c | 40 +++++++++++++++++----------------- drivers/gpu/drm/i915/intel_pm.c | 10 ++++----- include/drm/intel-gtt.h | 2 +- 8 files changed, 46 insertions(+), 45 deletions(-)
drivers/char/agp/intel-gtt.c +6 -6
@@ -80,7 +80,7 @@ static struct _intel_private { unsigned int needs_dmar : 1;phys_addr_t gma_bus_addr;/* Size of memory reserved for graphics by the BIOS */ -unsigned int stolen_size; +resource_size_t stolen_size;/* Total number of gtt entries. */ unsigned int gtt_total_entries;/* Part of the gtt that is mappable by the cpu, for those chips where
@@ -333,13 +333,13 @@ static void i810_write_entry(dma_addr_t addr, unsigned int entry,writel_relaxed (addr | pte_flags, intel_private.gtt + entry); } -static unsigned int intel_gtt_stolen_size (void ) +static resource_size_t 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 ; +resource_size_t stolen_size =0 ;if (INTEL_GTT_GEN ==1 )return 0 ;/* no stolen mem on i81x */
@@ -417,8 +417,8 @@ static unsigned int intel_gtt_stolen_size(void) }if (stolen_size >0 ) { -dev_info (&intel_private.bridge_dev->dev,"detected %dK %s memory\n" , - stolen_size /KB (1 ), local ?"local" :"stolen" ); +dev_info (&intel_private.bridge_dev->dev,"detected %lluK %s memory\n" , + (u64 )stolen_size /KB (1 ), local ?"local" :"stolen" ); }else {dev_info (&intel_private.bridge_dev->dev,"no pre-allocated video memory detected\n" );
@@ -1423,7 +1423,7 @@ EXPORT_SYMBOL(intel_gmch_probe);void intel_gtt_get (u64 *gtt_total,phys_addr_t *mappable_base, -u64 *mappable_end) +resource_size_t *mappable_end) { *gtt_total = intel_private.gtt_total_entries <<PAGE_SHIFT ; *mappable_base = intel_private.gma_bus_addr;
drivers/gpu/drm/i915/i915_debugfs.c +2 -2
@@ -522,8 +522,8 @@ static int i915_gem_object_info(struct seq_file *m, void *data)seq_printf (m,"%u display objects (globally pinned), %llu bytes\n" , dpy_count, dpy_size); -seq_printf (m,"%llu [%llu] gtt total\n" , - ggtt->base.total, ggtt->mappable_end); +seq_printf (m,"%llu [%pa] gtt total\n" , + ggtt->base.total, &ggtt->mappable_end);seq_printf (m,"Supported page sizes: %s\n" ,stringify_page_sizes (INTEL_INFO (dev_priv)->page_sizes, buf,sizeof (buf)));
drivers/gpu/drm/i915/i915_drv.h +6 -5
@@ -2271,7 +2271,7 @@ struct drm_i915_private {* avoid the first page! The upper end of stolen memory is reserved for * hardware functions and similarly removed from the accessible range. */ -u32 stolen_usable_size;/* Total size minus reserved ranges */ +resource_size_t stolen_usable_size;/* Total size minus reserved ranges */ void __iomem *regs;
@@ -3928,12 +3928,13 @@ void i915_gem_stolen_remove_node(struct drm_i915_private *dev_priv,int i915_gem_init_stolen (struct drm_i915_private *dev_priv);void i915_gem_cleanup_stolen (struct drm_device *dev);struct drm_i915_gem_object * -i915_gem_object_create_stolen (struct drm_i915_private *dev_priv,u32 size); +i915_gem_object_create_stolen (struct drm_i915_private *dev_priv, +resource_size_t size);struct drm_i915_gem_object *i915_gem_object_create_stolen_for_preallocated (struct drm_i915_private *dev_priv, -u32 stolen_offset, -u32 gtt_offset, -u32 size); +resource_size_t stolen_offset, +resource_size_t gtt_offset, +resource_size_t size);/* i915_gem_internal.c */ struct drm_i915_gem_object *
drivers/gpu/drm/i915/i915_gem_gtt.c +5 -5
@@ -3354,7 +3354,7 @@ static int gen6_gmch_probe(struct i915_ggtt *ggtt)* a coarse sanity check. */ if (ggtt->mappable_end < (64 <<20 ) || ggtt->mappable_end > (512 <<20 )) { -DRM_ERROR ("Unknown GMADR size (%llx)\n" , ggtt->mappable_end); +DRM_ERROR ("Unknown GMADR size (%pa)\n" , &ggtt->mappable_end);return -ENXIO ; }
@@ -3464,7 +3464,7 @@ int i915_ggtt_probe_hw(struct drm_i915_private *dev_priv)*/ if (USES_GUC (dev_priv)) { ggtt->base.total =min_t (u64, ggtt->base.total,GUC_GGTT_TOP ); - ggtt->mappable_end =min (ggtt->mappable_end, ggtt->base.total); + ggtt->mappable_end =min_t (u64, ggtt->mappable_end, ggtt->base.total); }if ((ggtt->base.total -1 ) >>32 ) {
@@ -3472,13 +3472,13 @@ int i915_ggtt_probe_hw(struct drm_i915_private *dev_priv)" of address space! Found %lldM!\n" , ggtt->base.total >> 20); ggtt->base.total =1ULL <<32 ; - ggtt->mappable_end =min (ggtt->mappable_end, ggtt->base.total); + ggtt->mappable_end =min_t (u64, ggtt->mappable_end, ggtt->base.total); }if (ggtt->mappable_end > ggtt->base.total) {DRM_ERROR ("mappable aperture extends past end of GGTT," -" aperture=%llx, total=%llx\n" , - ggtt->mappable_end, ggtt->base.total); +" aperture=%pa, total=%llx\n" , + &ggtt->mappable_end, ggtt->base.total); ggtt->mappable_end = ggtt->base.total; }
drivers/gpu/drm/i915/i915_gem_gtt.h +1 -1
@@ -371,7 +371,7 @@ struct i915_ggtt {struct io_mapping iomap;/* Mapping to our CPU mappable region */ struct resource gmadr;/* GMADR resource */ -u64 mappable_end;/* End offset that we can CPU map */ +resource_size_t mappable_end;/* End offset that we can CPU map */ /** "Graphics Stolen Memory" holds the global PTEs */ void __iomem *gsm;
drivers/gpu/drm/i915/i915_gem_stolen.c +20 -20
@@ -93,7 +93,7 @@ static int i915_adjust_stolen(struct drm_i915_private *dev_priv, DEFINE_RES_MEM(dsm->start, resource_size(dsm)), };struct resource ggtt_res; -u64 ggtt_start; +resource_size_t ggtt_start; ggtt_start =I915_READ (PGTBL_CTL );if (IS_GEN4 (dev_priv))
@@ -171,12 +171,12 @@ void i915_gem_cleanup_stolen(struct drm_device *dev) }static void g4x_get_stolen_reserved (struct drm_i915_private *dev_priv, -dma_addr_t *base,u32 *size) +resource_size_t *base,resource_size_t *size) {uint32_t reg_val =I915_READ (IS_GM45 (dev_priv) ?CTG_STOLEN_RESERVED :ELK_STOLEN_RESERVED ); -dma_addr_t stolen_top = dev_priv->dsm.end +1 ; +resource_size_t stolen_top = dev_priv->dsm.end +1 ;if ((reg_val &G4X_STOLEN_RESERVED_ENABLE ) ==0 ) { *base =0 ;
@@ -205,7 +205,7 @@ static void g4x_get_stolen_reserved(struct drm_i915_private *dev_priv, }static void gen6_get_stolen_reserved (struct drm_i915_private *dev_priv, -dma_addr_t *base,u32 *size) +resource_size_t *base,resource_size_t *size) {uint32_t reg_val =I915_READ (GEN6_STOLEN_RESERVED );
@@ -237,7 +237,7 @@ static void gen6_get_stolen_reserved(struct drm_i915_private *dev_priv, }static void gen7_get_stolen_reserved (struct drm_i915_private *dev_priv, -dma_addr_t *base,u32 *size) +resource_size_t *base,resource_size_t *size) {uint32_t reg_val =I915_READ (GEN6_STOLEN_RESERVED );
@@ -263,7 +263,7 @@ static void gen7_get_stolen_reserved(struct drm_i915_private *dev_priv, }static void chv_get_stolen_reserved (struct drm_i915_private *dev_priv, -dma_addr_t *base,u32 *size) +resource_size_t *base,resource_size_t *size) {uint32_t reg_val =I915_READ (GEN6_STOLEN_RESERVED );
@@ -295,10 +295,10 @@ static void chv_get_stolen_reserved(struct drm_i915_private *dev_priv, }static void bdw_get_stolen_reserved (struct drm_i915_private *dev_priv, -dma_addr_t *base,u32 *size) +resource_size_t *base,resource_size_t *size) {uint32_t reg_val =I915_READ (GEN6_STOLEN_RESERVED ); -dma_addr_t stolen_top; +resource_size_t stolen_top;if ((reg_val &GEN6_STOLEN_RESERVED_ENABLE ) ==0 ) { *base =0 ;
@@ -322,9 +322,9 @@ static void bdw_get_stolen_reserved(struct drm_i915_private *dev_priv,int i915_gem_init_stolen (struct drm_i915_private *dev_priv) { -dma_addr_t reserved_base, stolen_top; -u32 reserved_total, reserved_size; -u32 stolen_usable_start; +resource_size_t reserved_base, stolen_top; +resource_size_t reserved_total, reserved_size; +resource_size_t stolen_usable_start;mutex_init (&dev_priv->mm.stolen_lock);
@@ -424,14 +424,13 @@ int i915_gem_init_stolen(struct drm_i915_private *dev_priv)static struct sg_table *i915_pages_create_for_stolen (struct drm_device *dev, -u32 offset,u32 size) +resource_size_t offset,resource_size_t size) {struct drm_i915_private *dev_priv =to_i915 (dev);struct sg_table *st;struct scatterlist *sg; -GEM_BUG_ON (range_overflows_t (resource_size_t, offset, size, -resource_size (&dev_priv->dsm))); +GEM_BUG_ON (range_overflows (offset, size,resource_size (&dev_priv->dsm)));/* We hide that we have no struct page backing our stolen object * by wrapping the contiguous physical allocation with a fake
@@ -529,7 +528,8 @@ _i915_gem_object_create_stolen(struct drm_i915_private *dev_priv, }struct drm_i915_gem_object * -i915_gem_object_create_stolen (struct drm_i915_private *dev_priv,u32 size) +i915_gem_object_create_stolen (struct drm_i915_private *dev_priv, +resource_size_t size) {struct drm_i915_gem_object *obj;struct drm_mm_node *stolen;
@@ -562,9 +562,9 @@ i915_gem_object_create_stolen(struct drm_i915_private *dev_priv, u32 size)struct drm_i915_gem_object *i915_gem_object_create_stolen_for_preallocated (struct drm_i915_private *dev_priv, -u32 stolen_offset, -u32 gtt_offset, -u32 size) +resource_size_t stolen_offset, +resource_size_t gtt_offset, +resource_size_t size) {struct i915_ggtt *ggtt = &dev_priv->ggtt;struct drm_i915_gem_object *obj;
@@ -577,8 +577,8 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_i915_private *dev_privlockdep_assert_held (&dev_priv->drm.struct_mutex); -DRM_DEBUG_KMS ("creating preallocated stolen object: stolen_offset=%x, gtt_offset=%x, size=%x\n" , - stolen_offset, gtt_offset, size); +DRM_DEBUG_KMS ("creating preallocated stolen object: stolen_offset=%pa, gtt_offset=%pa, size=%pa\n" , + &stolen_offset, >t_offset, &size);/* KISS and expect everything to be page-aligned */ if (WARN_ON(size == 0) ||
drivers/gpu/drm/i915/intel_pm.c +5 -5
@@ -7033,9 +7033,9 @@ static void cherryview_check_pctx(struct drm_i915_private *dev_priv)static void cherryview_setup_pctx (struct drm_i915_private *dev_priv) { -unsigned long pctx_paddr, paddr; +resource_size_t pctx_paddr, paddr; +resource_size_t pctx_size =32 *1024 ;u32 pcbr; -int pctx_size =32 *1024 ; pcbr =I915_READ (VLV_PCBR );if ((pcbr >>VLV_PCBR_ADDR_SHIFT ) ==0 ) {
@@ -7053,14 +7053,14 @@ static void cherryview_setup_pctx(struct drm_i915_private *dev_priv)static void valleyview_setup_pctx (struct drm_i915_private *dev_priv) {struct drm_i915_gem_object *pctx; -unsigned long pctx_paddr; +resource_size_t pctx_paddr; +resource_size_t pctx_size =24 *1024 ;u32 pcbr; -int pctx_size =24 *1024 ; pcbr =I915_READ (VLV_PCBR );if (pcbr) {/* BIOS set it up already, grab the pre-alloc'd space */ -int pcbr_offset; +resource_size_t pcbr_offset; pcbr_offset = (pcbr & (~4095 )) - dev_priv->dsm.start; pctx = i915_gem_object_create_stolen_for_preallocated(dev_priv,
include/drm/intel-gtt.h +1 -1
@@ -6,7 +6,7 @@void intel_gtt_get (u64 *gtt_total,phys_addr_t *mappable_base, -u64 *mappable_end); +resource_size_t *mappable_end);int intel_gmch_probe (struct pci_dev *bridge_pdev,struct pci_dev *gpu_pdev,struct agp_bridge_data *bridge);
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 09/10] drm/i915: prefer resource_size_t for everything stolen
Quoting Matthew Auld (2017-12-06 18:17:29)
Quoted 21 lines
Keeps things consistent now that we make use of struct resource. This should keep us covered in case we ever get huge amounts of stolen memory.
v2: bunch of missing conversions (Chris)
Signed-off-by Matthew Auld <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Chris Wilson <[email protected]>Cc Paulo Zanoni <[email protected]>---
drivers/gpu/drm/i915/i915_gem_gtt.c +1
-1@@ -3464,7 +3464,7 @@ int i915_ggtt_probe_hw(struct drm_i915_private *dev_priv)*/ if (USES_GUC (dev_priv)) { ggtt->base.total =min_t (u64, ggtt->base.total,GUC_GGTT_TOP ); - ggtt->mappable_end =min (ggtt->mappable_end, ggtt->base.total); + ggtt->mappable_end =min_t (u64, ggtt->mappable_end, ggtt->base.total); }if ((ggtt->base.total -1 ) >>32 ) {
drivers/gpu/drm/i915/i915_gem_gtt.c int i915_ggtt_probe_hw(struct drm_i915_private *dev_priv) · line 3476
Quoted 6 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +1
-1@@ -3472,13 +3472,13 @@ int i915_ggtt_probe_hw(struct drm_i915_private *dev_priv)" of address space! Found %lldM!\n" , ggtt->base.total >> 20); ggtt->base.total =1ULL <<32 ; - ggtt->mappable_end =min (ggtt->mappable_end, ggtt->base.total); + ggtt->mappable_end =min_t (u64, ggtt->mappable_end, ggtt->base.total); }
Hmm. Not pretty, but I have no better alternative (other than plain old if()).
Reviewed-by Chris Wilson <[email protected]>
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 10/10 drm/i915: prefer stolen_usable_size for the range sanity check
In reply to Matthew AuldIn i915_pages_create_for_stolen it probably makes more sense to check if the range overflows the stolen_usable_size, since the size of dsm will also include the reserved portion which we can't touch.
Signed-off-by Matthew Auld <[email protected]>
Cc Joonas Lahtinen <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Paulo Zanoni <[email protected]>
--- drivers/gpu/drm/i915/i915_gem_stolen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_gem_stolen.c +1 -1
@@ -430,7 +430,7 @@ i915_pages_create_for_stolen(struct drm_device *dev,struct sg_table *st;struct scatterlist *sg; -GEM_BUG_ON (range_overflows (offset, size,resource_size (&dev_priv->dsm))); +GEM_BUG_ON (range_overflows (offset, size, dev_priv->stolen_usable_size));/* We hide that we have no struct page backing our stolen object * by wrapping the contiguous physical allocation with a fake
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 10/10] drm/i915: prefer stolen_usable_size for the range sanity check
Quoting Matthew Auld (2017-12-06 18:17:30)
Quoted 17 lines
In
i915_pages_create_for_stolenit probably makes more sense to check if the range overflows thestolen_usable_size, since the size of dsm will also include the reserved portion which we can't touch.Signed-off-by Matthew Auld <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Chris Wilson <[email protected]>Cc Paulo Zanoni <[email protected]>--- drivers/gpu/drm/i915/i915_gem_stolen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/i915_gem_stolen.c +0
-0
drivers/gpu/drm/i915/i915_gem_stolen.c i915_pages_create_for_stolen(struct drm_device *dev, · line 433
Quoted 5 lines
drivers/gpu/drm/i915/i915_gem_stolen.c +1
-1@@ -430,7 +430,7 @@ i915_pages_create_for_stolen(struct drm_device *dev,struct sg_table *st;struct scatterlist *sg; -GEM_BUG_ON (range_overflows (offset, size,resource_size (&dev_priv->dsm))); +GEM_BUG_ON (range_overflows (offset, size, dev_priv->stolen_usable_size));
I'm not sold. The usable size is a restriction placed on the drm_mm range manager that not everyone may be privy to; certainly when coming from HW that knows only about the stolen region.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for make stolen resource centric (rev5)
In reply to Matthew Auld== Series Details ==
== Series Details ==
Series: make stolen resource centric (rev5)
URL : https://patchwork.freedesktop.org/series/34256/
State : success
== Summary ==
Series 34256v5 make stolen resource centric
https://patchwork.freedesktop.org/api/1.0/series/34256/revisions/5/mbox/
Test gem_mmap_gtt:
Subgroup basic-small-bo-tiledx:
pass -> FAIL (fi-gdg-551) fdo#102575fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:445s fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:385s fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:515s fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:282s fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:500s fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:508s fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:489s fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:471s fi-elk-e7500 total:224 pass:163 dwarn:15 dfail:0 fail:0 skip:45 fi-gdg-551 total:288 pass:178 dwarn:1 dfail:0 fail:1 skip:108 time:270s fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:538s fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:373s fi-hsw-4770r total:288 pass:224 dwarn:0 dfail:0 fail:0 skip:64 time:257s fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:474s fi-ivb-3770 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:446s fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:531s fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:477s fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:535s fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:597s fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:453s fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:546s fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:568s fi-skl-6700k total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:518s fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:497s fi-snb-2520m total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:547s fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:413s Blacklisted hosts: fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:614s fi-cnl-y total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:615s fi-glk-dsi total:196 pass:182 dwarn:0 dfail:0 fail:0 skip:13
66be57731a40b46c8588811fbf4ca4d817122c20 drm-tip: 2017y-12m-06d-16h-12m-57s UTC integration manifest 9bb33f1c99b6 drm/i915: prefer stolen_usable_size for the range sanity check 0afe9f77b0b0 drm/i915: prefer resource_size_t for everything stolen6a28f842f3b0 drm/i915: give stolen_usable_size a more suitable home7d77e9211779 drm/i915: make mappable struct resource centric8b10a2867a4e drm/i915: make reserved struct resource centric6dd6ac3525eb drm/i915: make dsm struct resource centric87069582c4f4 drm/i915: nuke the duplicated stolen discovery78fce6ff81d4 x86/early-quirks: reverse the if laddersba05ce7b8e5b x86/early-quirks: replace the magical increment start values 289f2f0e9ae0 x86/early-quirks: Extend Intel graphics stolen memory placement to 64bit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7430/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for make stolen resource centric (rev5)
In reply to Matthew Auld== Series Details ==
== Series Details ==
Series: make stolen resource centric (rev5)
URL : https://patchwork.freedesktop.org/series/34256/
State : success
== Summary ==
Warning: bzip CI_DRM_3466/shard-snb2/results25.json.bz2 wasn't in correct JSON format Test perf:
Subgroup oa-exponents:
pass -> FAIL (shard-hsw) fdo#102254
Test kms_pipe_crc_basic:
Subgroup read-crc-pipe-b-frame-sequence:
pass -> INCOMPLETE (shard-hsw) fdo#102332
Test kms_setmode:
Subgroup basic:
fail -> PASS (shard-hsw) fdo#99912
Test kms_frontbuffer_tracking:
Subgroup fbc-1p-offscren-pri-shrfb-draw-blt:
pass -> FAIL (shard-snb) fdo#101623
Test drv_selftest:
Subgroup live_hangcheck:
pass -> INCOMPLETE (shard-snb) fdo#103880fdo#102254 https://bugs.freedesktop.org/show_bug.cgi?id=102254
fdo#102332 https://bugs.freedesktop.org/show_bug.cgi?id=102332
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
fdo#101623 https://bugs.freedesktop.org/show_bug.cgi?id=101623
fdo#103880 https://bugs.freedesktop.org/show_bug.cgi?id=103880
shard-hsw total:2623 pass:1505 dwarn:1 dfail:0 fail:10 skip:1106 time:9243s shard-snb total:2661 pass:1289 dwarn:1 dfail:0 fail:12 skip:1358 time:7965s
Blacklisted hosts:
shard-kbl total:2614 pass:1747 dwarn:6 dfail:0 fail:24 skip:835 time:10178s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7430/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx