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>

diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
index 64100fc..e6576b4 100644 (file)
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -4676,7 +4676,7 @@ static int cik_mec_init(struct radeon_device *rdev)
                r = radeon_bo_create(rdev,
                                     rdev->mec.num_mec *rdev->mec.num_pipe * MEC_HPD_SIZE * 2,
                                     PAGE_SIZE, true,
-                                    RADEON_GEM_DOMAIN_GTT, NULL,
+                                    RADEON_GEM_DOMAIN_GTT, 0, NULL,
                                     &rdev->mec.hpd_eop_obj);
                if (r) {
                        dev_warn(rdev->dev, "(%d) create HDP EOP bo failed\n", r);
@@ -4846,7 +4846,7 @@ static int cik_cp_compute_resume(struct radeon_device *rdev)
                        r = radeon_bo_create(rdev,
                                             sizeof(struct bonaire_mqd),
                                             PAGE_SIZE, true,
-                                            RADEON_GEM_DOMAIN_GTT, NULL,
+                                            RADEON_GEM_DOMAIN_GTT, 0, NULL,
                                             &rdev->ring[idx].mqd_obj);
                        if (r) {
                                dev_warn(rdev->dev, "(%d) create MQD bo failed\n", r);

diff --git a/drivers/gpu/drm/radeon/cik_sdma.c b/drivers/gpu/drm/radeon/cik_sdma.c
index 60aa1cb..4b2ab76 100644 (file)
--- 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;

diff --cc drivers/gpu/drm/radeon/evergreen.c
Simple merge

diff --cc drivers/gpu/drm/radeon/r600.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon.h
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_benchmark.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_device.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_fb.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_gart.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_gem.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_object.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_object.h
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_prime.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_ring.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_sa.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_test.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_ttm.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_uvd.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_vce.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_vm.c
Simple merge

diff --cc drivers/gpu/drm/radeon/si_dma.c
Simple merge