drm/i915: Stop using AGP layer for GEN6+
Subsystems (3)
PATCH v5 1/5 drm/i915: Stop using AGP layer for GEN6+
As a quick hack we make the old intel_gtt structure mutable so we can fool a bunch of the existing code which depends on elements in that data structure. We can/should try to remove this in a subsequent patch.
This should preserve the old gtt init behavior which upon writing these patches seems incorrect. The next patch will fix these things.
The one exception is VLV which doesn't have the preserved flush control write behavior. Since we want to do that for all GEN6+ stuff, we'll handle that in a later patch. Mainstream VLV support doesn't actually exist yet anyway.
v2: Update the comment to remove the "voodoo" Check that the last pte written matches what we readback
v3: actually kill cache_level_to_agp_type since most of the flags will disappear in an upcoming patch
v4: v3 was actually not what we wanted (Daniel) Make the ggtt bind assertions better and stricter (Chris) Fix some uncaught errors at gtt init (Chris) Some other random stuff that Chris wanted
v5: check for i==0 in gen6_ggtt_bind_object to shut up gcc (Ben)
Reviewed-by [v4]: Chris Wilson <[email protected]>
--- drivers/char/agp/intel-gtt.c | 2 +- drivers/gpu/drm/i915/i915_dma.c | 16 +- drivers/gpu/drm/i915/i915_drv.h | 10 +- drivers/gpu/drm/i915/i915_gem.c | 12 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 257 +++++++++++++++++++++++++---- drivers/gpu/drm/i915/i915_reg.h | 6 + include/drm/intel-gtt.h | 3 +- 8 files changed, 257 insertions(+), 51 deletions(-)
drivers/char/agp/intel-gtt.c +1 -1
@@ -1686,7 +1686,7 @@ int intel_gmch_probe(struct pci_dev *bridge_pdev, struct pci_dev *gpu_pdev, }EXPORT_SYMBOL (intel_gmch_probe); -const struct intel_gtt *intel_gtt_get (void ) +struct intel_gtt *intel_gtt_get (void ) {return &intel_private.base; }
drivers/gpu/drm/i915/i915_dma.c +3 -13
@@ -1494,19 +1494,9 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) goto free_priv; } - ret =intel_gmch_probe (dev_priv->bridge_dev, dev->pdev,NULL ); -if (!ret) { -DRM_ERROR ("failed to set up gmch\n" ); - ret = -EIO ; + ret =i915_gem_gtt_init (dev); +if (ret) goto put_bridge; - } - - dev_priv->mm.gtt =intel_gtt_get (); -if (!dev_priv->mm.gtt) { -DRM_ERROR ("Failed to initialize GTT\n" ); - ret = -ENODEV ; - goto put_gmch; - }i915_kick_out_firmware_fb (dev_priv);
@@ -1680,7 +1670,7 @@ out_mtrrfree: out_rmmap:pci_iounmap (dev->pdev, dev_priv->regs); put_gmch: -intel_gmch_remove (); +i915_gem_gtt_fini (dev); put_bridge:pci_dev_put (dev_priv->bridge_dev); free_priv:
drivers/gpu/drm/i915/i915_drv.h +9 -1
@@ -686,7 +686,7 @@ typedef struct drm_i915_private {struct {/** Bridge to intel-gtt-ko */ -const struct intel_gtt *gtt; +struct intel_gtt *gtt;/** Memory allocator for GTT stolen memory */ struct drm_mm stolen;/** Memory allocator for GTT */
@@ -1505,6 +1505,14 @@ void i915_gem_init_global_gtt(struct drm_device *dev,unsigned long start, unsigned long mappable_end, unsigned long end); +int i915_gem_gtt_init (struct drm_device *dev); +void i915_gem_gtt_fini (struct drm_device *dev); +extern inline void i915_gem_chipset_flush (struct drm_device *dev) +{ +if (INTEL_INFO (dev)->gen <6 ) +intel_gtt_chipset_flush (); +} +/* i915_gem_evict.c */ int __must_check i915_gem_evict_something(struct drm_device *dev, int min_size,
drivers/gpu/drm/i915/i915_gem.c +6 -6
@@ -845,12 +845,12 @@ out:* domain anymore. */ if (obj->base.write_domain !=I915_GEM_DOMAIN_CPU ) {i915_gem_clflush_object (obj); -intel_gtt_chipset_flush (); +i915_gem_chipset_flush (dev); } }if (needs_clflush_after) -intel_gtt_chipset_flush (); +i915_gem_chipset_flush (dev);return ret; }
@@ -3058,7 +3058,7 @@ i915_gem_object_flush_cpu_write_domain(struct drm_i915_gem_object *obj)return ;i915_gem_clflush_object (obj); -intel_gtt_chipset_flush (); +i915_gem_chipset_flush (obj->base.dev); old_write_domain = obj->base.write_domain; obj->base.write_domain =0 ;
@@ -3959,7 +3959,7 @@ i915_gem_init_hw(struct drm_device *dev)drm_i915_private_t *dev_priv = dev->dev_private;int ret; -if (!intel_enable_gtt ()) +if (INTEL_INFO (dev)->gen <6 && !intel_enable_gtt ())return -EIO ;if (IS_HASWELL (dev) && (I915_READ (0x120010 ) ==1 ))
@@ -4294,7 +4294,7 @@ void i915_gem_detach_phys_object(struct drm_device *dev,page_cache_release (page); } } -intel_gtt_chipset_flush (); +i915_gem_chipset_flush (dev); obj->phys_obj->cur_obj =NULL ; obj->phys_obj =NULL ;
@@ -4381,7 +4381,7 @@ i915_gem_phys_pwrite(struct drm_device *dev,return -EFAULT ; } -intel_gtt_chipset_flush (); +i915_gem_chipset_flush (dev);return 0 ; }
drivers/gpu/drm/i915/i915_gem_execbuffer.c +1 -1
@@ -672,7 +672,7 @@ i915_gem_execbuffer_move_to_gpu(struct intel_ring_buffer *ring, }if (flush_domains &I915_GEM_DOMAIN_CPU ) -intel_gtt_chipset_flush (); +i915_gem_chipset_flush (ring->dev);if (flush_domains &I915_GEM_DOMAIN_GTT )wmb ();
drivers/gpu/drm/i915/i915_gem_gtt.c +229 -28
301 lines not on this page · raw message
drivers/gpu/drm/i915/i915_reg.h +6 -0
@@ -41,6 +41,12 @@*/ #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 */
include/drm/intel-gtt.h +2 -1
@@ -3,7 +3,7 @@ #ifndef _DRM_INTEL_GTT_H #define _DRM_INTEL_GTT_H -const struct intel_gtt { +struct intel_gtt { /* Size of memory reserved for graphics by the BIOS */ unsigned int stolen_size; /* Total number of gtt entries. */
@@ -17,6 +17,7 @@ const struct intel_gtt { unsigned int do_idle_maps : 1;/* Share the scratch page dma with ppgtts. */ dma_addr_t scratch_page_dma; +struct page *scratch_page;/* for ppgtt PDE access */ u32 __iomem *gtt;/* needed for ioremap in drm/i915 */
Signature · 1 line
1.8.0
PATCH 2/5 drm/i915: Calculate correct stolen size for GEN7+
This bug existed in the old code, but was easier to fix here in the rework. Unfortunately gen7 doesn't have a nice way to figure out the size and we must use a lookup table.
As Jesse pointed out, there is some confusion in the docs about these definitions. We're picking the one which seems more accurate, but we really aren't certain.
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 14 +++++++++++++- drivers/gpu/drm/i915/i915_reg.h | 2 ++ 2 files changed, 15 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +13 -1
@@ -512,6 +512,15 @@ static inline unsigned int gen6_get_stolen_size(u16 snb_gmch_ctl)return snb_gmch_ctl <<25 ;/* 32 MB units */ } +static inline unsigned int gen7_get_stolen_size (u16 snb_gmch_ctl) +{ +static const int stolen_decoder[] = { +0 ,0 ,0 ,0 ,0 ,32 ,48 ,64 ,128 ,256 ,96 ,160 ,224 ,352 }; + snb_gmch_ctl >>=IVB_GMCH_GMS_SHIFT ; + snb_gmch_ctl &=IVB_GMCH_GMS_MASK ; +return stolen_decoder[snb_gmch_ctl] <<20 ; +} +int i915_gem_gtt_init (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;
@@ -557,7 +566,10 @@ int i915_gem_gtt_init(struct drm_device *dev)pci_read_config_word (dev->pdev,SNB_GMCH_CTRL , &snb_gmch_ctl); dev_priv->mm.gtt->gtt_total_entries =gen6_get_total_gtt_size (snb_gmch_ctl) /sizeof (gtt_pte_t); - dev_priv->mm.gtt->stolen_size =gen6_get_stolen_size (snb_gmch_ctl); +if (INTEL_INFO (dev)->gen <7 ) + dev_priv->mm.gtt->stolen_size =gen6_get_stolen_size (snb_gmch_ctl); +else + dev_priv->mm.gtt->stolen_size =gen7_get_stolen_size (snb_gmch_ctl); dev_priv->mm.gtt->gtt_mappable_entries =pci_resource_len (dev->pdev,2 ) >>PAGE_SHIFT ;/* 64/512MB is the current min/max we actually know of, but this is just a
drivers/gpu/drm/i915/i915_reg.h +2 -0
@@ -46,6 +46,8 @@#define SNB_GMCH_GGMS_MASK 0x3#define SNB_GMCH_GMS_SHIFT 3/* Graphics Mode Select */ #define SNB_GMCH_GMS_MASK 0x1f +#define IVB_GMCH_GMS_SHIFT 4 +#define IVB_GMCH_GMS_MASK 0xf/* PCI config space */
Signature · 1 line
1.8.0
PATCH v2 3/5 drm/i915: Kill off now unused gen6+ AGP code
In reply to Ben Widawskyv2: Accidently removed an ILK case in i9xx_setup (Nicely found by Chris)
CC: Chris Wilson <[email protected]> Reviewed-by [v1] : Jesse Barnes <[email protected]>
--- drivers/char/agp/intel-agp.h | 91 ------------- drivers/char/agp/intel-gtt.c | 318 ++----------------------------------------- include/drm/intel-gtt.h | 4 - 3 files changed, 11 insertions(+), 402 deletions(-)
drivers/char/agp/intel-agp.h +0 -91
@@ -62,12 +62,6 @@#define I810_PTE_LOCAL 0x00000002#define I810_PTE_VALID 0x00000001#define I830_PTE_SYSTEM_CACHED 0x00000006 -/* GT PTE cache control fields */ -#define GEN6_PTE_UNCACHED 0x00000002 -#define HSW_PTE_UNCACHED 0x00000000 -#define GEN6_PTE_LLC 0x00000004 -#define GEN6_PTE_LLC_MLC 0x00000006 -#define GEN6_PTE_GFDT 0x00000008#define I810_SMRAM_MISCC 0x70#define I810_GFX_MEM_WIN_SIZE 0x00010000
@@ -97,7 +91,6 @@#define G4x_GMCH_SIZE_VT_2M (G4x_GMCH_SIZE_2M | G4x_GMCH_SIZE_VT_EN)#define GFX_FLSH_CNTL 0x2170/* 915+ */ -#define GFX_FLSH_CNTL_VLV 0x101008#define I810_DRAM_CTL 0x3000#define I810_DRAM_ROW_0 0x00000001
@@ -148,29 +141,6 @@#define INTEL_I7505_AGPCTRL 0x70#define INTEL_I7505_MCHCFG 0x50 -#define SNB_GMCH_CTRL 0x50 -#define SNB_GMCH_GMS_STOLEN_MASK 0xF8 -#define SNB_GMCH_GMS_STOLEN_32M (1 << 3) -#define SNB_GMCH_GMS_STOLEN_64M (2 << 3) -#define SNB_GMCH_GMS_STOLEN_96M (3 << 3) -#define SNB_GMCH_GMS_STOLEN_128M (4 << 3) -#define SNB_GMCH_GMS_STOLEN_160M (5 << 3) -#define SNB_GMCH_GMS_STOLEN_192M (6 << 3) -#define SNB_GMCH_GMS_STOLEN_224M (7 << 3) -#define SNB_GMCH_GMS_STOLEN_256M (8 << 3) -#define SNB_GMCH_GMS_STOLEN_288M (9 << 3) -#define SNB_GMCH_GMS_STOLEN_320M (0xa << 3) -#define SNB_GMCH_GMS_STOLEN_352M (0xb << 3) -#define SNB_GMCH_GMS_STOLEN_384M (0xc << 3) -#define SNB_GMCH_GMS_STOLEN_416M (0xd << 3) -#define SNB_GMCH_GMS_STOLEN_448M (0xe << 3) -#define SNB_GMCH_GMS_STOLEN_480M (0xf << 3) -#define SNB_GMCH_GMS_STOLEN_512M (0x10 << 3) -#define SNB_GTT_SIZE_0M (0 << 8) -#define SNB_GTT_SIZE_1M (1 << 8) -#define SNB_GTT_SIZE_2M (2 << 8) -#define SNB_GTT_SIZE_MASK (3 << 8) -/* pci devices ids */ #define PCI_DEVICE_ID_INTEL_E7221_HB 0x2588#define PCI_DEVICE_ID_INTEL_E7221_IG 0x258a
@@ -219,66 +189,5 @@#define PCI_DEVICE_ID_INTEL_IRONLAKE_MA_HB 0x0062#define PCI_DEVICE_ID_INTEL_IRONLAKE_MC2_HB 0x006a#define PCI_DEVICE_ID_INTEL_IRONLAKE_M_IG 0x0046 -#define PCI_DEVICE_ID_INTEL_SANDYBRIDGE_HB 0x0100/* Desktop */ -#define PCI_DEVICE_ID_INTEL_SANDYBRIDGE_GT1_IG 0x0102 -#define PCI_DEVICE_ID_INTEL_SANDYBRIDGE_GT2_IG 0x0112 -#define PCI_DEVICE_ID_INTEL_SANDYBRIDGE_GT2_PLUS_IG 0x0122 -#define PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_HB 0x0104/* Mobile */ -#define PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_GT1_IG 0x0106 -#define PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_GT2_IG 0x0116 -#define PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_GT2_PLUS_IG 0x0126 -#define PCI_DEVICE_ID_INTEL_SANDYBRIDGE_S_HB 0x0108/* Server */ -#define PCI_DEVICE_ID_INTEL_SANDYBRIDGE_S_IG 0x010A -#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_HB 0x0150/* Desktop */ -#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_GT1_IG 0x0152 -#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_GT2_IG 0x0162 -#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_M_HB 0x0154/* Mobile */ -#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_M_GT1_IG 0x0156 -#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_M_GT2_IG 0x0166 -#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_S_HB 0x0158/* Server */ -#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_S_GT1_IG 0x015A -#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_S_GT2_IG 0x016A -#define PCI_DEVICE_ID_INTEL_VALLEYVIEW_HB 0x0F00/* VLV1 */ -#define PCI_DEVICE_ID_INTEL_VALLEYVIEW_IG 0x0F30 -#define PCI_DEVICE_ID_INTEL_HASWELL_HB 0x0400/* Desktop */ -#define PCI_DEVICE_ID_INTEL_HASWELL_D_GT1_IG 0x0402 -#define PCI_DEVICE_ID_INTEL_HASWELL_D_GT2_IG 0x0412 -#define PCI_DEVICE_ID_INTEL_HASWELL_D_GT2_PLUS_IG 0x0422 -#define PCI_DEVICE_ID_INTEL_HASWELL_M_HB 0x0404/* Mobile */ -#define PCI_DEVICE_ID_INTEL_HASWELL_M_GT1_IG 0x0406 -#define PCI_DEVICE_ID_INTEL_HASWELL_M_GT2_IG 0x0416 -#define PCI_DEVICE_ID_INTEL_HASWELL_M_GT2_PLUS_IG 0x0426 -#define PCI_DEVICE_ID_INTEL_HASWELL_S_HB 0x0408/* Server */ -#define PCI_DEVICE_ID_INTEL_HASWELL_S_GT1_IG 0x040a -#define PCI_DEVICE_ID_INTEL_HASWELL_S_GT2_IG 0x041a -#define PCI_DEVICE_ID_INTEL_HASWELL_S_GT2_PLUS_IG 0x042a -#define PCI_DEVICE_ID_INTEL_HASWELL_E_HB 0x0c04 -#define PCI_DEVICE_ID_INTEL_HASWELL_SDV_D_GT1_IG 0x0C02 -#define PCI_DEVICE_ID_INTEL_HASWELL_SDV_D_GT2_IG 0x0C12 -#define PCI_DEVICE_ID_INTEL_HASWELL_SDV_D_GT2_PLUS_IG 0x0C22 -#define PCI_DEVICE_ID_INTEL_HASWELL_SDV_M_GT1_IG 0x0C06 -#define PCI_DEVICE_ID_INTEL_HASWELL_SDV_M_GT2_IG 0x0C16 -#define PCI_DEVICE_ID_INTEL_HASWELL_SDV_M_GT2_PLUS_IG 0x0C26 -#define PCI_DEVICE_ID_INTEL_HASWELL_SDV_S_GT1_IG 0x0C0A -#define PCI_DEVICE_ID_INTEL_HASWELL_SDV_S_GT2_IG 0x0C1A -#define PCI_DEVICE_ID_INTEL_HASWELL_SDV_S_GT2_PLUS_IG 0x0C2A -#define PCI_DEVICE_ID_INTEL_HASWELL_ULT_D_GT1_IG 0x0A02 -#define PCI_DEVICE_ID_INTEL_HASWELL_ULT_D_GT2_IG 0x0A12 -#define PCI_DEVICE_ID_INTEL_HASWELL_ULT_D_GT2_PLUS_IG 0x0A22 -#define PCI_DEVICE_ID_INTEL_HASWELL_ULT_M_GT1_IG 0x0A06 -#define PCI_DEVICE_ID_INTEL_HASWELL_ULT_M_GT2_IG 0x0A16 -#define PCI_DEVICE_ID_INTEL_HASWELL_ULT_M_GT2_PLUS_IG 0x0A26 -#define PCI_DEVICE_ID_INTEL_HASWELL_ULT_S_GT1_IG 0x0A0A -#define PCI_DEVICE_ID_INTEL_HASWELL_ULT_S_GT2_IG 0x0A1A -#define PCI_DEVICE_ID_INTEL_HASWELL_ULT_S_GT2_PLUS_IG 0x0A2A -#define PCI_DEVICE_ID_INTEL_HASWELL_CRW_D_GT1_IG 0x0D12 -#define PCI_DEVICE_ID_INTEL_HASWELL_CRW_D_GT2_IG 0x0D22 -#define PCI_DEVICE_ID_INTEL_HASWELL_CRW_D_GT2_PLUS_IG 0x0D32 -#define PCI_DEVICE_ID_INTEL_HASWELL_CRW_M_GT1_IG 0x0D16 -#define PCI_DEVICE_ID_INTEL_HASWELL_CRW_M_GT2_IG 0x0D26 -#define PCI_DEVICE_ID_INTEL_HASWELL_CRW_M_GT2_PLUS_IG 0x0D36 -#define PCI_DEVICE_ID_INTEL_HASWELL_CRW_S_GT1_IG 0x0D1A -#define PCI_DEVICE_ID_INTEL_HASWELL_CRW_S_GT2_IG 0x0D2A -#define PCI_DEVICE_ID_INTEL_HASWELL_CRW_S_GT2_PLUS_IG 0x0D3A#endif
drivers/char/agp/intel-gtt.c +11 -307
375 lines not on this page · raw message
include/drm/intel-gtt.h +0 -4
@@ -40,10 +40,6 @@ void intel_gtt_clear_range(unsigned int first_entry, unsigned int num_entries);#define AGP_DCACHE_MEMORY 1#define AGP_PHYS_MEMORY 2 -/* New caching attributes for gen6/sandybridge */ -#define AGP_USER_CACHED_MEMORY_LLC_MLC (AGP_USER_TYPES + 2) -#define AGP_USER_UNCACHED_MEMORY (AGP_USER_TYPES + 4) -/* flag for GFDT type */ #define AGP_USER_CACHED_MEMORY_GFDT (1 << 3)
Signature · 1 line
1.8.0
PATCH v2 4/5 drm/i915: flush system agent TLBs on SNB
In reply to Ben WidawskyThis allows us to map the PTEs WC. I've not done thorough testing or performance measurements with this patch, but it should be decent.
This is based on a patch from Jesse with the original commit message
Quoted 4 lines
I've only lightly tested this so far, but the corruption seems to be gone if I write the
GFX_FLSH_CNTLreg after binding an object. This register should control the TLB for the system agent, which is what CPU mapped objects will go through.
It has been updated for the new AGP-less code by me, and included with it is feedback from the original patch.
v2: Updated to reflect paranoia on pte updates/register posting reads.
Reviewed-by [v1]: Jesse Barnes <[email protected]>
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 11 +++++++++-- drivers/gpu/drm/i915/i915_reg.h | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +9 -2
@@ -379,6 +379,13 @@ static void gen6_ggtt_bind_object(struct drm_i915_gem_object *obj,*/ if (i !=0 )WARN_ON (readl (>t_entries[i-1 ]) !=pte_encode (dev, addr, level)); + +/* This next bit makes the above posting read even more important. We +* want to flush the TLBs only after we're certain all the PTE updates +* have finished. +*/ +I915_WRITE (GFX_FLSH_CNTL_GEN6 ,GFX_FLSH_CNTL_EN ); +POSTING_READ (GFX_FLSH_CNTL_GEN6 ); } void i915_gem_gtt_bind_object(struct drm_i915_gem_object *obj,
@@ -589,8 +596,8 @@ int i915_gem_gtt_init(struct drm_device *dev) goto err_out; } - dev_priv->mm.gtt->gtt =ioremap (gtt_bus_addr, - dev_priv->mm.gtt->gtt_total_entries *sizeof (gtt_pte_t)); + dev_priv->mm.gtt->gtt =ioremap_wc (gtt_bus_addr, + dev_priv->mm.gtt->gtt_total_entries *sizeof (gtt_pte_t));if (!dev_priv->mm.gtt->gtt) {DRM_ERROR ("Failed to map the gtt page table\n" );teardown_scratch_page (dev);
drivers/gpu/drm/i915/i915_reg.h +2 -0
@@ -688,6 +688,8 @@#define CM0_RC_OP_FLUSH_DISABLE (1<<0)#define BB_ADDR 0x02140/* 8 bytes */ #define GFX_FLSH_CNTL 0x02170/* 915+ only */ +#define GFX_FLSH_CNTL_GEN6 0x101008 +#define GFX_FLSH_CNTL_EN (1<<0)#define ECOSKPD 0x021d0#define ECO_GATING_CX_ONLY (1<<3)#define ECO_FLIP_DONE (1<<0)
Signature · 1 line
1.8.0
PATCH 5/5 drm/i915: Move the remaining gtt code
In reply to Ben WidawskyIt's pretty much all consolidated now that we've killed AGP. We can move the one outlier, and defines too.
(Kill some unused defines in the process)
--- drivers/gpu/drm/i915/i915_gem.c | 62 ------------------------------ drivers/gpu/drm/i915/i915_gem_gtt.c | 76 +++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_reg.h | 17 --------- 3 files changed, 76 insertions(+), 79 deletions(-)
drivers/gpu/drm/i915/i915_gem.c +0 -62
@@ -3875,68 +3875,6 @@ void i915_gem_init_swizzling(struct drm_device *dev)I915_WRITE (ARB_MODE ,_MASKED_BIT_ENABLE (ARB_MODE_SWIZZLE_IVB )); } -void i915_gem_init_ppgtt (struct drm_device *dev) -{ -drm_i915_private_t *dev_priv = dev->dev_private; -uint32_t pd_offset; -struct intel_ring_buffer *ring; -struct i915_hw_ppgtt *ppgtt = dev_priv->mm.aliasing_ppgtt; -uint32_t __iomem *pd_addr; -uint32_t pd_entry; -int i; - -if (!dev_priv->mm.aliasing_ppgtt) -return ; - - - pd_addr = dev_priv->mm.gtt->gtt + ppgtt->pd_offset/sizeof (uint32_t ); -for (i =0 ; i < ppgtt->num_pd_entries; i++) { -dma_addr_t pt_addr; - -if (dev_priv->mm.gtt->needs_dmar) - pt_addr = ppgtt->pt_dma_addr[i]; -else - pt_addr =page_to_phys (ppgtt->pt_pages[i]); - - pd_entry =GEN6_PDE_ADDR_ENCODE (pt_addr); - pd_entry |=GEN6_PDE_VALID ; - -writel (pd_entry, pd_addr + i); - } -readl (pd_addr); - - pd_offset = ppgtt->pd_offset; - pd_offset /=64 ;/* in cachelines, */ - pd_offset <<=16 ; - -if (INTEL_INFO (dev)->gen ==6 ) { -uint32_t ecochk, gab_ctl, ecobits; - - ecobits =I915_READ (GAC_ECO_BITS ); -I915_WRITE (GAC_ECO_BITS , ecobits |ECOBITS_PPGTT_CACHE64B ); - - gab_ctl =I915_READ (GAB_CTL ); -I915_WRITE (GAB_CTL , gab_ctl |GAB_CTL_CONT_AFTER_PAGEFAULT ); - - ecochk =I915_READ (GAM_ECOCHK ); -I915_WRITE (GAM_ECOCHK , ecochk |ECOCHK_SNB_BIT | -ECOCHK_PPGTT_CACHE64B ); -I915_WRITE (GFX_MODE ,_MASKED_BIT_ENABLE (GFX_PPGTT_ENABLE )); - }else if (INTEL_INFO (dev)->gen >=7 ) { -I915_WRITE (GAM_ECOCHK ,ECOCHK_PPGTT_CACHE64B ); -/* GFX_MODE is per-ring on gen7+ */ - } - -for_each_ring (ring, dev_priv, i) { -if (INTEL_INFO (dev)->gen >=7 ) -I915_WRITE (RING_MODE_GEN7 (ring), -_MASKED_BIT_ENABLE (GFX_PPGTT_ENABLE )); - -I915_WRITE (RING_PP_DIR_DCLV (ring),PP_DIR_DCLV_2G ); -I915_WRITE (RING_PP_DIR_BASE (ring), pd_offset); - } -} -static bool intel_enable_blt (struct drm_device *dev) {
drivers/gpu/drm/i915/i915_gem_gtt.c +76 -0
88 lines not on this page · raw message
drivers/gpu/drm/i915/i915_reg.h +0 -17
@@ -114,23 +114,6 @@#define GEN6_GRDOM_MEDIA (1 << 2)#define GEN6_GRDOM_BLT (1 << 3) -/* PPGTT stuff */ -#define GEN6_GTT_ADDR_ENCODE (addr) ((addr) | (((addr) >> 28) & 0xff0)) - -#define GEN6_PDE_VALID (1 << 0) -#define GEN6_PDE_LARGE_PAGE (2 << 0)/* use 32kb pages */ -/* gen6+ has bit 11-4 for physical addr bit 39-32 */ -#define GEN6_PDE_ADDR_ENCODE (addr) GEN6_GTT_ADDR_ENCODE(addr) - -#define GEN6_PTE_VALID (1 << 0) -#define GEN6_PTE_UNCACHED (1 << 1) -#define HSW_PTE_UNCACHED (0) -#define GEN6_PTE_CACHE_LLC (2 << 1) -#define GEN6_PTE_CACHE_LLC_MLC (3 << 1) -#define GEN6_PTE_CACHE_BITS (3 << 1) -#define GEN6_PTE_GFDT (1 << 3) -#define GEN6_PTE_ADDR_ENCODE (addr) GEN6_GTT_ADDR_ENCODE(addr) -#define RING_PP_DIR_BASE (ring) ((ring)->mmio_base+0x228)#define RING_PP_DIR_BASE_READ (ring) ((ring)->mmio_base+0x518)#define RING_PP_DIR_DCLV (ring) ((ring)->mmio_base+0x220)
Signature · 1 line
1.8.0
Re: [PATCH 5/5] drm/i915: Move the remaining gtt code
Quoted 7 lines · Ben Widawsky
It's pretty much all consolidated now that we've killed AGP. We can move the one outlier, and defines too.
(Kill some unused defines in the process)
Signed-off-by Ben Widawsky <[email protected]>Reviewed-by Chris Wilson <[email protected]>
Entire series merged, with Chris' irc r-b added for patch 3.
Thanks, Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
drivers/gpu/drm/i915/i915_gem_gtt.c int i915_gem_gtt_prepare_object(struct drm_i915_gem_object *obj) · line 390
Quoted 8 lines · Ben Widawsky
void i915_gem_gtt_bind_object(struct
drm_i915_gem_object*obj,drivers/gpu/drm/i915/i915_gem_gtt.c +3
-1enum i915_cache_level cache_level) {struct drm_device *dev = obj->base.dev; -unsigned int agp_type =cache_level_to_agp_type (dev, cache_level); +if (INTEL_INFO (dev)->gen <6 ) { +unsigned int flags = (cache_level ==I915_CACHE_LLC ) ? +AGP_USER_CACHED_MEMORY :AGP_USER_MEMORY ;
And we still failed to get this right. :(
cache_level == I915_CACHE_NONE ? AGP_USER_MEMORY : AGP_USER_CACHED_MEMORY;
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre