lkml.org 
[lkml]   [2012]   [May]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 03/11] intel-gtt: Read 64bit for gmar_bus_addr
    Date
    That bar could be 64bit pref mem.

    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    Cc: David Airlie <airlied@linux.ie>
    ---
    drivers/char/agp/intel-gtt.c | 14 ++++++++++----
    1 files changed, 10 insertions(+), 4 deletions(-)

    diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
    index 7f025fb..77e150e 100644
    --- a/drivers/char/agp/intel-gtt.c
    +++ b/drivers/char/agp/intel-gtt.c
    @@ -770,16 +770,22 @@ static void i830_write_entry(dma_addr_t addr, unsigned int entry,
    static bool intel_enable_gtt(void)
    {
    u32 gma_addr;
    + u32 addr_hi = 0;
    u8 __iomem *reg;
    + int pos;

    if (INTEL_GTT_GEN <= 2)
    - pci_read_config_dword(intel_private.pcidev, I810_GMADDR,
    - &gma_addr);
    + pos = I810_GMADDR;
    else
    - pci_read_config_dword(intel_private.pcidev, I915_GMADDR,
    - &gma_addr);
    + pos = I915_GMADDR;
    +
    + pci_read_config_dword(intel_private.pcidev, pos, &gma_addr);
    +
    + if (gma_addr & PCI_BASE_ADDRESS_MEM_TYPE_64)
    + pci_read_config_dword(intel_private.pcidev, pos + 4, &addr_hi);

    intel_private.gma_bus_addr = (gma_addr & PCI_BASE_ADDRESS_MEM_MASK);
    + intel_private.gma_bus_addr |= (u64)addr_hi << 32;

    if (INTEL_GTT_GEN >= 6)
    return true;
    --
    1.7.7


    \
     
     \ /
      Last update: 2012-05-23 09:41    [W:0.026 / U:2.244 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site