aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2014-09-04 14:01:52 -0400
committerAlex Deucher <alexander.deucher@amd.com>2014-09-11 10:46:00 -0400
commitae9c0af2c0ea92e57013ab2dd7271ba7d6b2a833 (patch)
treeb524a3c3960582346b60418d068d96317e79696b /drivers/gpu/drm/radeon
parentc4d922b14544d115232b7448a2ea7640ba901eb6 (diff)
drm/ttm: allow fence to be added as shared
This patch adds a new flag to the ttm_validate_buffer list to add the fence as shared to the reservation object. Signed-off-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon')
-rw-r--r--drivers/gpu/drm/radeon/radeon_cs.c1
-rw-r--r--drivers/gpu/drm/radeon/radeon_vm.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
index 6e3d1c8f3483..cd517ab93608 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -183,6 +183,7 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
183 } 183 }
184 184
185 p->relocs[i].tv.bo = &p->relocs[i].robj->tbo; 185 p->relocs[i].tv.bo = &p->relocs[i].robj->tbo;
186 p->relocs[i].tv.shared = false;
186 p->relocs[i].handle = r->handle; 187 p->relocs[i].handle = r->handle;
187 188
188 radeon_cs_buckets_add(&buckets, &p->relocs[i].tv.head, 189 radeon_cs_buckets_add(&buckets, &p->relocs[i].tv.head,
diff --git a/drivers/gpu/drm/radeon/radeon_vm.c b/drivers/gpu/drm/radeon/radeon_vm.c
index 671ee566aa51..1cce4468cd75 100644
--- a/drivers/gpu/drm/radeon/radeon_vm.c
+++ b/drivers/gpu/drm/radeon/radeon_vm.c
@@ -143,6 +143,7 @@ struct radeon_cs_reloc *radeon_vm_get_bos(struct radeon_device *rdev,
143 list[0].prefered_domains = RADEON_GEM_DOMAIN_VRAM; 143 list[0].prefered_domains = RADEON_GEM_DOMAIN_VRAM;
144 list[0].allowed_domains = RADEON_GEM_DOMAIN_VRAM; 144 list[0].allowed_domains = RADEON_GEM_DOMAIN_VRAM;
145 list[0].tv.bo = &vm->page_directory->tbo; 145 list[0].tv.bo = &vm->page_directory->tbo;
146 list[0].tv.shared = false;
146 list[0].tiling_flags = 0; 147 list[0].tiling_flags = 0;
147 list[0].handle = 0; 148 list[0].handle = 0;
148 list_add(&list[0].tv.head, head); 149 list_add(&list[0].tv.head, head);
@@ -156,6 +157,7 @@ struct radeon_cs_reloc *radeon_vm_get_bos(struct radeon_device *rdev,
156 list[idx].prefered_domains = RADEON_GEM_DOMAIN_VRAM; 157 list[idx].prefered_domains = RADEON_GEM_DOMAIN_VRAM;
157 list[idx].allowed_domains = RADEON_GEM_DOMAIN_VRAM; 158 list[idx].allowed_domains = RADEON_GEM_DOMAIN_VRAM;
158 list[idx].tv.bo = &list[idx].robj->tbo; 159 list[idx].tv.bo = &list[idx].robj->tbo;
160 list[idx].tv.shared = false;
159 list[idx].tiling_flags = 0; 161 list[idx].tiling_flags = 0;
160 list[idx].handle = 0; 162 list[idx].handle = 0;
161 list_add(&list[idx++].tv.head, head); 163 list_add(&list[idx++].tv.head, head);
@@ -395,6 +397,7 @@ static int radeon_vm_clear_bo(struct radeon_device *rdev,
395 397
396 memset(&tv, 0, sizeof(tv)); 398 memset(&tv, 0, sizeof(tv));
397 tv.bo = &bo->tbo; 399 tv.bo = &bo->tbo;
400 tv.shared = false;
398 401
399 INIT_LIST_HEAD(&head); 402 INIT_LIST_HEAD(&head);
400 list_add(&tv.head, &head); 403 list_add(&tv.head, &head);