lkml.org 
[lkml]   [2010]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/23] agp/ali: Use the dma_addr instead of page_to_phys for m1541_[alloc|destroy]_page.
    Date
    The dma_addr contains the same value as page_to_phys(page). That is
    until the PCI API is enabled at which point the dma_addr will
    contain the true DMA (bus) address - which on baremetal will in all
    likehood be the same as page_to_phys(page). But under Xen, it might
    be different.

    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
    ---
    drivers/char/agp/ali-agp.c | 4 ++--
    1 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/char/agp/ali-agp.c b/drivers/char/agp/ali-agp.c
    index ede9d0a..92382d7 100644
    --- a/drivers/char/agp/ali-agp.c
    +++ b/drivers/char/agp/ali-agp.c
    @@ -153,7 +153,7 @@ static struct page *m1541_alloc_page(struct agp_bridge_data *bridge,
    pci_read_config_dword(agp_bridge->dev, ALI_CACHE_FLUSH_CTRL, &temp);
    pci_write_config_dword(agp_bridge->dev, ALI_CACHE_FLUSH_CTRL,
    (((temp & ALI_CACHE_FLUSH_ADDR_MASK) |
    - page_to_phys(page)) | ALI_CACHE_FLUSH_EN ));
    + *dma_addr) | ALI_CACHE_FLUSH_EN ));
    return page;
    }

    @@ -182,7 +182,7 @@ static void m1541_destroy_page(struct page *page, int flags,
    pci_read_config_dword(agp_bridge->dev, ALI_CACHE_FLUSH_CTRL, &temp);
    pci_write_config_dword(agp_bridge->dev, ALI_CACHE_FLUSH_CTRL,
    (((temp & ALI_CACHE_FLUSH_ADDR_MASK) |
    - page_to_phys(page)) | ALI_CACHE_FLUSH_EN));
    + *dma_addr) | ALI_CACHE_FLUSH_EN));
    }
    agp_generic_destroy_page(page, flags, dma_addr);
    }
    --
    1.7.1


    \
     
     \ /
      Last update: 2010-12-07 00:33    [W:4.256 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site