drm/radeon: export reservation_object from dmabuf to ttm

Adds an extra argument to radeon_bo_create, which is only used in radeon_prime.c.

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.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 fc49a8d..d48a539 100644 (file)
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -4687,7 +4687,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, 0, NULL,
+                                    RADEON_GEM_DOMAIN_GTT, 0, NULL, NULL,
                                     &rdev->mec.hpd_eop_obj);
                if (r) {
                        dev_warn(rdev->dev, "(%d) create HDP EOP bo failed\n", r);
@@ -4858,7 +4858,7 @@ static int cik_cp_compute_resume(struct radeon_device *rdev)
                                             sizeof(struct bonaire_mqd),
                                             PAGE_SIZE, true,
                                             RADEON_GEM_DOMAIN_GTT, 0, NULL,
-                                            &rdev->ring[idx].mqd_obj);
+                                            NULL, &rdev->ring[idx].mqd_obj);
                        if (r) {
                                dev_warn(rdev->dev, "(%d) create MQD bo failed\n", r);
                                return r;

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_benchmark.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_device.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