Skip to content

Commit

Permalink
agp/intel-gtt: move gart base addres setup
Browse files Browse the repository at this point in the history
We need this thing much earlier, and it doesn't make sense
in the hw enabling function intel_enable_gtt - this does not
change over a suspend/resume cycle ...

Reviewed-by: Jani Nikula <jani.nikula@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Daniel Vetter committed Jun 12, 2012
1 parent 14be93d commit 32e3cd6
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions drivers/char/agp/intel-gtt.c
Original file line number Diff line number Diff line change
Expand Up @@ -648,6 +648,7 @@ static void intel_gtt_cleanup(void)

static int intel_gtt_init(void)
{
u32 gma_addr;
u32 gtt_map_size;
int ret;

Expand Down Expand Up @@ -694,6 +695,15 @@ static int intel_gtt_init(void)
return ret;
}

if (INTEL_GTT_GEN <= 2)
pci_read_config_dword(intel_private.pcidev, I810_GMADDR,
&gma_addr);
else
pci_read_config_dword(intel_private.pcidev, I915_GMADDR,
&gma_addr);

intel_private.base.gma_bus_addr = (gma_addr & PCI_BASE_ADDRESS_MEM_MASK);

return 0;
}

Expand Down Expand Up @@ -769,18 +779,8 @@ static void i830_write_entry(dma_addr_t addr, unsigned int entry,

static bool intel_enable_gtt(void)
{
u32 gma_addr;
u8 __iomem *reg;

if (INTEL_GTT_GEN <= 2)
pci_read_config_dword(intel_private.pcidev, I810_GMADDR,
&gma_addr);
else
pci_read_config_dword(intel_private.pcidev, I915_GMADDR,
&gma_addr);

intel_private.base.gma_bus_addr = (gma_addr & PCI_BASE_ADDRESS_MEM_MASK);

if (INTEL_GTT_GEN >= 6)
return true;

Expand Down

0 comments on commit 32e3cd6

Please sign in to comment.