drm/i915: Create a vtable for i915 gtt
Subsystems (3)
RFC PATCH 1/3 drm/i915: Create a vtable for i915 gtt
Before going further I wanted to run these 3 patches by the ML...
The GTT handling has changed from generation to generation. There was a particularly large shift around the gen5 time frame. The GTT itself those provides a few core functions which make it a nice candidate for a dispatch table. A similar concepts exists in the AGP layer, and were it not for design constraints in those functions and code duplication in i915, that would have been sufficient. In any case, it's the same idea.
One immediately obvious thing to implement is our gmch probing. The init function was getting massively bloated. Fundamentally, all that's needed from GMCH probing is the GTT size, and the stolen size. As some examples though of things which are nice for this table which will come up: pte encoding, range clearing, entry updates, etc. I've been going back and forth regarding whether or not to put the stolen size calculation into the dispatch table...
The intel_gtt bridge thing is still here, but the subsequent patches will finish ripping that out.
A couple things worth note:
+ The DRM_INFO and DRM_DEBUG_DRIVER displaying the GTT info wasn't done on pre-GEN6 before hand. Now is is.
- There is a pretty ugly hack regarding the kfree of the gtt struct. That ill be gone soon, I promise. I only left it because it shows reviewers what the patch is striving to achieve with regard to the cleanup of the gtt init function. I can fix it up if requested.
--- drivers/gpu/drm/i915/i915_dma.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 9 ++ drivers/gpu/drm/i915/i915_gem_gtt.c | 174 ++++++++++++++++++++++-------------- 3 files changed, 119 insertions(+), 66 deletions(-)
drivers/gpu/drm/i915/i915_dma.c +1 -1
@@ -1665,7 +1665,7 @@ out_mtrrfree: out_rmmap:pci_iounmap (dev->pdev, dev_priv->regs); put_gmch: -i915_gem_gtt_fini (dev); + dev_priv->gtt.gtt_ops->gmch_remove (dev); put_bridge:pci_dev_put (dev_priv->bridge_dev); free_priv:
drivers/gpu/drm/i915/i915_drv.h +9 -0
@@ -364,6 +364,12 @@ struct intel_device_info { u8 has_llc:1; }; +struct i915_gtt_operations { +int (*gmch_probe)(struct drm_device *dev,size_t *gtt_total, +size_t *stolen); +void (*gmch_remove)(struct drm_device *dev); +}; +/* The Graphics Translation Table is the way in which GEN hardware translates a * Graphics Virtual Address into a Physical Address. In addition to the normal * collateral associated with any va->pa translations GEN hardware also has a
@@ -374,6 +380,7 @@ struct intel_device_info {struct i915_gtt {unsigned long start;/* Start offset of used GTT */ size_t total;/* Total size GTT can map */ +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 */
@@ -385,6 +392,8 @@ struct i915_gtt {bool do_idle_maps;dma_addr_t scratch_page_dma;struct page *scratch_page; + +const struct i915_gtt_operations *gtt_ops; };#define I915_PPGTT_PD_ENTRIES 512
drivers/gpu/drm/i915/i915_gem_gtt.c +109 -65
220 lines not on this page · raw message
Signature · 1 line
1.8.1.1
RFC PATCH 2/3 drm/i915: Resume dissecting intel_gtt
With the GMCH call in our dispatch table, we can now cut away two of the remaining members in the intel_gtt shared struct.
--- drivers/char/agp/intel-gtt.c | 20 +++++++++++++------- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_gem_gtt.c | 17 ++++++----------- drivers/gpu/drm/i915/i915_gem_stolen.c | 8 ++++---- include/drm/intel-gtt.h | 6 +----- 5 files changed, 25 insertions(+), 27 deletions(-)
drivers/char/agp/intel-gtt.c +13 -7
@@ -80,6 +80,10 @@ static struct _intel_private {/* Whether i915 needs to use the dmar apis or not. */ unsigned int needs_dmar : 1;phys_addr_t gma_bus_addr; +/* Size of memory reserved for graphics by the BIOS */ +unsigned int stolen_size; +/* Total number of gtt entries. */ +unsigned int gtt_total_entries; } intel_private;#define INTEL_GTT_GEN intel_private.driver->gen
@@ -577,7 +581,7 @@ static int intel_gtt_init(void)return ret; intel_private.base.gtt_mappable_entries =intel_gtt_mappable_entries (); - intel_private.base.gtt_total_entries =intel_gtt_total_entries (); + intel_private.gtt_total_entries =intel_gtt_total_entries ();/* save the PGETBL reg for resume */ intel_private.PGETBL_save =
@@ -589,10 +593,10 @@ static int intel_gtt_init(void)dev_info (&intel_private.bridge_dev->dev,"detected gtt size: %dK total, %dK mappable\n" , - intel_private.base.gtt_total_entries *4 , + intel_private.gtt_total_entries *4 , intel_private.base.gtt_mappable_entries *4 ); - gtt_map_size = intel_private.base.gtt_total_entries *4 ; + gtt_map_size = intel_private.gtt_total_entries *4 ; intel_private.gtt =NULL ;if (INTEL_GTT_GEN <6 &&INTEL_GTT_GEN >2 )
@@ -609,7 +613,7 @@ static int intel_gtt_init(void)global_cache_flush ();/* FIXME: ? */ - intel_private.base.stolen_size =intel_gtt_stolen_size (); + intel_private.stolen_size =intel_gtt_stolen_size (); intel_private.needs_dmar =USE_PCI_DMA_API &&INTEL_GTT_GEN >2 ;
@@ -845,7 +849,7 @@ static int intel_fake_agp_insert_entries(struct agp_memory *mem,int ret = -EINVAL ;if (intel_private.clear_fake_agp) { -int start = intel_private.base.stolen_size /PAGE_SIZE ; +int start = intel_private.stolen_size /PAGE_SIZE ;int end = intel_private.base.gtt_mappable_entries;intel_gtt_clear_range (start, end - start); intel_private.clear_fake_agp = false;
@@ -857,7 +861,7 @@ static int intel_fake_agp_insert_entries(struct agp_memory *mem,if (mem->page_count ==0 ) goto out; -if (pg_start + mem->page_count > intel_private.base.gtt_total_entries) +if (pg_start + mem->page_count > intel_private.gtt_total_entries) goto out_err;if (type != mem->type)
@@ -1366,8 +1370,10 @@ int intel_gmch_probe(struct pci_dev *bridge_pdev, struct pci_dev *gpu_pdev, }EXPORT_SYMBOL (intel_gmch_probe); -struct intel_gtt *intel_gtt_get (void ) +struct intel_gtt *intel_gtt_get (size_t *gtt_total,size_t *stolen_size) { + *gtt_total = intel_private.gtt_total_entries <<PAGE_SHIFT ; + *stolen_size = intel_private.stolen_size;return &intel_private.base; }EXPORT_SYMBOL (intel_gtt_get);
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -395,6 +395,7 @@ struct i915_gtt {const struct i915_gtt_operations *gtt_ops; }; +#define gtt_total_entries (gtt) ((gtt).total >> PAGE_SHIFT)#define I915_PPGTT_PD_ENTRIES 512#define I915_PPGTT_PT_ENTRIES 1024
drivers/gpu/drm/i915/i915_gem_gtt.c +6 -11
@@ -119,7 +119,8 @@ int i915_gem_init_aliasing_ppgtt(struct drm_device *dev)/* ppgtt PDEs reside in the global gtt pagetable, which has 512*1024 * entries. For aliasing ppgtt support we just steal them at the end for * now. */ - first_pd_entry_in_global_pt = dev_priv->mm.gtt->gtt_total_entries -I915_PPGTT_PD_ENTRIES ; + first_pd_entry_in_global_pt = +gtt_total_entries (dev_priv->gtt) -I915_PPGTT_PD_ENTRIES ; ppgtt =kzalloc (sizeof (*ppgtt),GFP_KERNEL );if (!ppgtt)
@@ -374,7 +375,7 @@ static void i915_ggtt_clear_range(struct drm_device *dev,struct drm_i915_private *dev_priv = dev->dev_private;gtt_pte_t scratch_pte;gtt_pte_t __iomem *gtt_base = (gtt_pte_t __iomem *) dev_priv->gtt.gsm + first_entry; -const int max_entries = dev_priv->mm.gtt->gtt_total_entries - first_entry; +const int max_entries =gtt_total_entries (dev_priv->gtt) - first_entry;int i;if (INTEL_INFO (dev)->gen <6 ) {
@@ -437,7 +438,7 @@ static void gen6_ggtt_bind_object(struct drm_i915_gem_object *obj,struct sg_table *st = obj->pages;struct scatterlist *sg = st->sgl;const int first_entry = obj->gtt_space->start >>PAGE_SHIFT ; -const int max_entries = dev_priv->mm.gtt->gtt_total_entries - first_entry; +const int max_entries =gtt_total_entries (dev_priv->gtt) - first_entry;gtt_pte_t __iomem *gtt_entries = (gtt_pte_t __iomem *)dev_priv->gtt.gsm + first_entry;int unused, i =0 ;
@@ -600,7 +601,7 @@ void i915_gem_init_global_gtt(struct drm_device *dev)unsigned long gtt_size, mappable_size;int ret; - gtt_size = dev_priv->mm.gtt->gtt_total_entries <<PAGE_SHIFT ; + gtt_size = dev_priv->gtt.total; mappable_size = dev_priv->gtt.mappable_end;if (intel_enable_ppgtt (dev) &&HAS_ALIASING_PPGTT (dev)) {
@@ -746,7 +747,7 @@ static int i915_gmch_probe(struct drm_device *dev, size_t *gtt_total,return -EIO ; } - dev_priv->mm.gtt =intel_gtt_get (); + dev_priv->mm.gtt =intel_gtt_get (gtt_total, stolen);if (!dev_priv->mm.gtt) {DRM_ERROR ("Failed to initialize GTT\n" );intel_gmch_remove ();
@@ -755,9 +756,6 @@ static int i915_gmch_probe(struct drm_device *dev, size_t *gtt_total, dev_priv->gtt.do_idle_maps =needs_idle_maps (dev); - *gtt_total = dev_priv->mm.gtt->gtt_total_entries <<PAGE_SHIFT ; - *stolen = dev_priv->mm.gtt->stolen_size <<PAGE_SHIFT ; -return 0 ; }
@@ -798,9 +796,6 @@ int i915_gem_gtt_init(struct drm_device *dev)return ret; } - dev_priv->mm.gtt->gtt_total_entries = dev_priv->gtt.total >>PAGE_SHIFT ; - dev_priv->mm.gtt->stolen_size = dev_priv->gtt.stolen_size; -/* For GEN6+ the PTEs for the ggtt live at 2MB + BAR0 */ gtt_bus_addr =pci_resource_start (dev->pdev,0 ) + (2 <<20 ); gtt_size = (dev_priv->gtt.total >>PAGE_SHIFT ) *sizeof (gtt_pte_t);
drivers/gpu/drm/i915/i915_gem_stolen.c +4 -4
@@ -187,11 +187,11 @@ int i915_gem_init_stolen(struct drm_device *dev)if (dev_priv->mm.stolen_base ==0 )return 0 ; -DRM_DEBUG_KMS ("found %d bytes of stolen memory at %08lx\n" , - dev_priv->mm.gtt->stolen_size, dev_priv->mm.stolen_base); +DRM_DEBUG_KMS ("found %zd bytes of stolen memory at %08lx\n" , + dev_priv->gtt.stolen_size, dev_priv->mm.stolen_base);/* Basic memrange allocator for stolen space */ -drm_mm_init (&dev_priv->mm.stolen,0 , dev_priv->mm.gtt->stolen_size); +drm_mm_init (&dev_priv->mm.stolen,0 , dev_priv->gtt.stolen_size);return 0 ; }
@@ -205,7 +205,7 @@ i915_pages_create_for_stolen(struct drm_device *dev,struct scatterlist *sg;DRM_DEBUG_DRIVER ("offset=0x%x, size=%d\n" , offset, size); -BUG_ON (offset > dev_priv->mm.gtt->stolen_size - size); +BUG_ON (offset > dev_priv->gtt.stolen_size - size);/* We hide that we have no struct page backing our stolen object * by wrapping the contiguous physical allocation with a fake
include/drm/intel-gtt.h +1 -5
@@ -4,14 +4,10 @@#define _DRM_INTEL_GTT_Hstruct intel_gtt { -/* Size of memory reserved for graphics by the BIOS */ -unsigned int 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 * this is not the full gtt. */ unsigned int gtt_mappable_entries; -} *intel_gtt_get (void ); +} *intel_gtt_get (size_t *gtt_total,size_t *stolen_size);int intel_gmch_probe (struct pci_dev *bridge_pdev,struct pci_dev *gpu_pdev,struct agp_bridge_data *bridge);
Signature · 1 line
1.8.1.1
RFC PATCH 3/3 drm/i915: With the vtable, intel_gtt is useless
In reply to Ben Widawsky--- drivers/char/agp/intel-gtt.c | 18 +++++++++--------- drivers/gpu/drm/i915/i915_drv.h | 2 -- drivers/gpu/drm/i915/i915_gem_gtt.c | 21 ++------------------- include/drm/intel-gtt.h | 6 +----- 4 files changed, 12 insertions(+), 35 deletions(-)
drivers/char/agp/intel-gtt.c +9 -9
@@ -60,7 +60,6 @@ struct intel_gtt_driver { }; static struct _intel_private { - struct intel_gtt base; const struct intel_gtt_driver *driver; struct pci_dev *pcidev; /* device one */ struct pci_dev *bridge_dev;
@@ -84,6 +83,9 @@ static struct _intel_private {unsigned int 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 +* this is not the full gtt. */ +unsigned int gtt_mappable_entries; } intel_private;#define INTEL_GTT_GEN intel_private.driver->gen
@@ -514,7 +516,7 @@ static unsigned int intel_gtt_total_entries(void)/* On previous hardware, the GTT size was just what was * required to map the aperture. */ -return intel_private.base.gtt_mappable_entries; +return intel_private.gtt_mappable_entries; } }
@@ -580,7 +582,7 @@ static int intel_gtt_init(void)if (ret !=0 )return ret; - intel_private.base.gtt_mappable_entries =intel_gtt_mappable_entries (); + intel_private.gtt_mappable_entries =intel_gtt_mappable_entries (); intel_private.gtt_total_entries =intel_gtt_total_entries ();/* save the PGETBL reg for resume */
@@ -594,7 +596,7 @@ static int intel_gtt_init(void)dev_info (&intel_private.bridge_dev->dev,"detected gtt size: %dK total, %dK mappable\n" , intel_private.gtt_total_entries *4 , - intel_private.base.gtt_mappable_entries *4 ); + intel_private.gtt_mappable_entries *4 ); gtt_map_size = intel_private.gtt_total_entries *4 ;
@@ -641,8 +643,7 @@ static int intel_fake_agp_fetch_size(void)unsigned int aper_size;int i; - aper_size = (intel_private.base.gtt_mappable_entries <<PAGE_SHIFT ) - /MB (1 ); + aper_size = (intel_private.gtt_mappable_entries <<PAGE_SHIFT ) /MB (1 );for (i =0 ; i < num_sizes; i++) {if (aper_size == intel_fake_agp_sizes[i].size) {
@@ -850,7 +851,7 @@ static int intel_fake_agp_insert_entries(struct agp_memory *mem,if (intel_private.clear_fake_agp) {int start = intel_private.stolen_size /PAGE_SIZE ; -int end = intel_private.base.gtt_mappable_entries; +int end = intel_private.gtt_mappable_entries;intel_gtt_clear_range (start, end - start); intel_private.clear_fake_agp = false; }
@@ -1370,11 +1371,10 @@ int intel_gmch_probe(struct pci_dev *bridge_pdev, struct pci_dev *gpu_pdev, }EXPORT_SYMBOL (intel_gmch_probe); -struct intel_gtt *intel_gtt_get (size_t *gtt_total,size_t *stolen_size) +void intel_gtt_get (size_t *gtt_total,size_t *stolen_size) { *gtt_total = intel_private.gtt_total_entries <<PAGE_SHIFT ; *stolen_size = intel_private.stolen_size; -return &intel_private.base; }EXPORT_SYMBOL (intel_gtt_get);
drivers/gpu/drm/i915/i915_drv.h +0 -2
@@ -676,8 +676,6 @@ struct intel_l3_parity { };struct i915_gem_mm { -/** Bridge to intel-gtt-ko */ -struct intel_gtt *gtt;/** Memory allocator for GTT stolen memory */ struct drm_mm stolen;/** Memory allocator for GTT */
drivers/gpu/drm/i915/i915_gem_gtt.c +2 -19
@@ -721,7 +721,6 @@ void gen6_gmch_remove(struct drm_device *dev)struct drm_i915_private *dev_priv = dev->dev_private;iounmap (dev_priv->gtt.gsm);teardown_scratch_page (dev); -kfree (dev_priv->mm.gtt); }static const struct i915_gtt_operations gen6_gtt_ops = {
@@ -735,10 +734,6 @@ static int i915_gmch_probe(struct drm_device *dev, size_t *gtt_total,struct drm_i915_private *dev_priv = dev->dev_private;int ret; -/* This is a temporary hack to make the code cleaner in -* i915_gem_gtt_init. I promise it will go away very shortly. */ -kfree (dev_priv->mm.gtt); -BUG_ON (INTEL_INFO (dev)->gen >5 ); ret =intel_gmch_probe (dev_priv->bridge_dev, dev->pdev,NULL );
@@ -747,13 +742,7 @@ static int i915_gmch_probe(struct drm_device *dev, size_t *gtt_total,return -EIO ; } - dev_priv->mm.gtt =intel_gtt_get (gtt_total, stolen); -if (!dev_priv->mm.gtt) { -DRM_ERROR ("Failed to initialize GTT\n" ); -intel_gmch_remove (); -return -ENODEV ; - } - +intel_gtt_get (gtt_total, stolen); dev_priv->gtt.do_idle_maps =needs_idle_maps (dev);return 0 ;
@@ -785,16 +774,10 @@ int i915_gem_gtt_init(struct drm_device *dev) dev_priv->gtt.mappable_base =pci_resource_start (dev->pdev,2 ); dev_priv->gtt.mappable_end =pci_resource_len (dev->pdev,2 ); - dev_priv->mm.gtt =kzalloc (sizeof (*dev_priv->mm.gtt),GFP_KERNEL ); -if (!dev_priv->mm.gtt) -return -ENOMEM ; - ret = dev_priv->gtt.gtt_ops->gmch_probe (dev, &dev_priv->gtt.total, &dev_priv->gtt.stolen_size); -if (ret) { -kfree (dev_priv->mm.gtt); +if (ret)return ret; - }/* For GEN6+ the PTEs for the ggtt live at 2MB + BAR0 */ gtt_bus_addr =pci_resource_start (dev->pdev,0 ) + (2 <<20 );
include/drm/intel-gtt.h +1 -5
@@ -3,11 +3,7 @@#ifndef _DRM_INTEL_GTT_H#define _DRM_INTEL_GTT_H -struct intel_gtt { -/* Part of the gtt that is mappable by the cpu, for those chips where -* this is not the full gtt. */ -unsigned int gtt_mappable_entries; -} *intel_gtt_get (size_t *gtt_total,size_t *stolen_size); +void intel_gtt_get (size_t *gtt_total,size_t *stolen_size);int intel_gmch_probe (struct pci_dev *bridge_pdev,struct pci_dev *gpu_pdev,struct agp_bridge_data *bridge);
Signature · 1 line
1.8.1.1