drm/i915: Use pci_resource functions for BARs.
Subsystems (2)
PATCH 1/1 drm/i915: Use pci_resource functions for BARs.
This was leftover crap from kill-agp. The current code is theoretically broken for 64b bars. (I resist removing theoretically because I am too lazy to test).
We still need to ioremap things ourselves because we want to ioremap_wc the PTEs.
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +2 -5
@@ -638,12 +638,9 @@ int i915_gem_gtt_init(struct drm_device *dev)if (!pci_set_dma_mask (dev->pdev,DMA_BIT_MASK (40 )))pci_set_consistent_dma_mask (dev->pdev,DMA_BIT_MASK (40 )); -pci_read_config_dword (dev->pdev,PCI_BASE_ADDRESS_0 , &tmp);/* For GEN6+ the PTEs for the ggtt live at 2MB + BAR0 */ - gtt_bus_addr = (tmp &PCI_BASE_ADDRESS_MEM_MASK ) + (2 <<20 ); - -pci_read_config_dword (dev->pdev,PCI_BASE_ADDRESS_2 , &tmp); - dev_priv->mm.gtt->gma_bus_addr = tmp &PCI_BASE_ADDRESS_MEM_MASK ; + gtt_bus_addr =pci_resource_start (dev->pdev,0 ) + (2 <<20 ); + dev_priv->mm.gtt->gma_bus_addr =pci_resource_start (dev->pdev,2 );/* i9xx_setup */ pci_read_config_word (dev->pdev,SNB_GMCH_CTRL , &snb_gmch_ctl);
Signature · 1 line
1.8.0
PATCH v2 1/1 drm/i915: Use pci_resource functions for BARs.
This was leftover crap from kill-agp. The current code is theoretically broken for 64b bars. (I resist removing theoretically because I am too lazy to test).
We still need to ioremap things ourselves because we want to ioremap_wc the PTEs.
v2: Forgot to kill the tmp variable in v1
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +2 -6
@@ -609,7 +609,6 @@ int i915_gem_gtt_init(struct drm_device *dev)struct drm_i915_private *dev_priv = dev->dev_private;phys_addr_t gtt_bus_addr;u16 snb_gmch_ctl; -u32 tmp;int ret;/* On modern platforms we need not worry ourself with the legacy
@@ -638,12 +637,9 @@ int i915_gem_gtt_init(struct drm_device *dev)if (!pci_set_dma_mask (dev->pdev,DMA_BIT_MASK (40 )))pci_set_consistent_dma_mask (dev->pdev,DMA_BIT_MASK (40 )); -pci_read_config_dword (dev->pdev,PCI_BASE_ADDRESS_0 , &tmp);/* For GEN6+ the PTEs for the ggtt live at 2MB + BAR0 */ - gtt_bus_addr = (tmp &PCI_BASE_ADDRESS_MEM_MASK ) + (2 <<20 ); - -pci_read_config_dword (dev->pdev,PCI_BASE_ADDRESS_2 , &tmp); - dev_priv->mm.gtt->gma_bus_addr = tmp &PCI_BASE_ADDRESS_MEM_MASK ; + gtt_bus_addr =pci_resource_start (dev->pdev,0 ) + (2 <<20 ); + dev_priv->mm.gtt->gma_bus_addr =pci_resource_start (dev->pdev,2 );/* i9xx_setup */ pci_read_config_word (dev->pdev,SNB_GMCH_CTRL , &snb_gmch_ctl);
Signature · 1 line
1.8.0
Quoted 11 lines · Ben Widawsky
This was leftover crap from kill-agp. The current code is theoretically broken for 64b bars. (I resist removing theoretically because I am too lazy to test).
We still need to ioremap things ourselves because we want to
ioremap_wcthe PTEs.v2: Forgot to kill the tmp variable in v1
CC Chris Wilson <[email protected]>Signed-off-by Ben Widawsky <[email protected]>
Nice.
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Daniel Vetter
AppliedQuoted 8 lines · Chris Wilson
Quoted 7 lines · Ben Widawsky
This was leftover crap from kill-agp. The current code is theoretically broken for 64b bars. (I resist removing theoretically because I am too lazy to test).
We still need to ioremap things ourselves because we want to
ioremap_wcthe PTEs.
Quoted 8 lines
Quoted 4 lines
v2: Forgot to kill the tmp variable in v1
CC Chris Wilson <[email protected]>Signed-off-by Ben Widawsky <[email protected]>Nice.
Reviewed-by Chris Wilson <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch