diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2014-07-17 19:01:08 +0900 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2014-08-05 08:53:33 -0400 |
| commit | 02376d8282b88f07d0716da6155094c8760b1a13 (patch) | |
| tree | 9e81e9b229f9230f2d42f8e80fdd50966eac13bc /drivers/gpu/drm/radeon/cik_sdma.c | |
| parent | 77497f2735ad6e29c55475e15e9790dbfa2c2ef8 (diff) | |
| download | linux-02376d8282b88f07d0716da6155094c8760b1a13.tar.gz linux-02376d8282b88f07d0716da6155094c8760b1a13.tar.bz2 linux-02376d8282b88f07d0716da6155094c8760b1a13.zip | |
drm/radeon: Allow write-combined CPU mappings of BOs in GTT (v2)
v2: fix rebase onto drm-fixes
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/cik_sdma.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/cik_sdma.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/cik_sdma.c b/drivers/gpu/drm/radeon/cik_sdma.c index 60aa1cb39f2f..4b2ab769cd99 100644 --- a/drivers/gpu/drm/radeon/cik_sdma.c +++ b/drivers/gpu/drm/radeon/cik_sdma.c @@ -771,7 +771,8 @@ void cik_sdma_vm_set_page(struct radeon_device *rdev, trace_radeon_vm_set_page(pe, addr, count, incr, flags); - if (flags == R600_PTE_GART) { + /* XXX: How to distinguish between GART and other system memory pages? */ + if (flags & R600_PTE_SYSTEM) { uint64_t src = rdev->gart.table_addr + (addr >> 12) * 8; while (count) { unsigned bytes = count * 8; |