History

drm/amdgpu: add AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS flag v3

Add a flag noting that a BO must be created using linear VRAM and set this flag on all in kernel users where appropriate. Hopefully I haven't missed anything. v2: add it in a few more places, fix CPU mapping. v3: rename to VRAM_CONTIGUOUS, fix typo in CS code.

Christian König committed 10 years ago

Commit 03f48dd1 parent cfa325513 files · +53 −18Browse files

Unified · Split

13 files
  1. drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +4 −2
  2. drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +9 −0
  3. drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2 −1
  4. drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c +2 −1
  5. drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c +2 −1
  6. drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +10 −2
  7. drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +2 −1
  8. drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +4 −2
  9. drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +2 −1
  10. drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +4 −2
  11. drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +6 −3
  12. drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +4 −2
  13. include/uapi/drm/amdgpu_drm.h +2 −0
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c+4−2
@@ -146,7 +146,8 @@ static int amdgpu_cgs_alloc_gpu_mem(struct cgs_device *cgs_device, · 145 unmodified lines
146146 switch(type) {
147147 case CGS_GPU_MEM_TYPE__VISIBLE_CONTIG_FB:
148148 case CGS_GPU_MEM_TYPE__VISIBLE_FB:
149− flags = AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED;
149+ flags = AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED |
150+ AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS;
150151 domain = AMDGPU_GEM_DOMAIN_VRAM;
151152 if (max_offset > adev->mc.real_vram_size)
152153 return -EINVAL;
@@ -157,7 +158,8 @@ static int amdgpu_cgs_alloc_gpu_mem(struct cgs_device *cgs_device, · 4 unmodified lines
157158 break;
158159 case CGS_GPU_MEM_TYPE__INVISIBLE_CONTIG_FB:
159160 case CGS_GPU_MEM_TYPE__INVISIBLE_FB:
160− flags = AMDGPU_GEM_CREATE_NO_CPU_ACCESS;
161+ flags = AMDGPU_GEM_CREATE_NO_CPU_ACCESS |
162+ AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS;
161163 domain = AMDGPU_GEM_DOMAIN_VRAM;
162164 if (adev->mc.visible_vram_size < adev->mc.real_vram_size) {
163165 place.fpfn =
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c+9−0
@@ -1195,6 +1195,15 @@ int amdgpu_cs_sysvm_access_required(struct amdgpu_cs_parser *parser) · 1194 unmodified lines
11951195 r = amdgpu_ttm_bind(&bo->tbo, &bo->tbo.mem);
11961196 if (unlikely(r))
11971197 return r;
1198+
1199+ if (bo->flags & AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS)
1200+ continue;
1201+
1202+ bo->flags |= AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS;
1203+ amdgpu_ttm_placement_from_domain(bo, bo->allowed_domains);
1204+ r = ttm_bo_validate(&bo->tbo, &bo->placement, false, false);
1205+ if (unlikely(r))
1206+ return r;
11981207 }
11991208
12001209 return 0;
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c+2−1
@@ -264,7 +264,8 @@ static int amdgpu_vram_scratch_init(struct amdgpu_device *adev) · 263 unmodified lines
264264 if (adev->vram_scratch.robj == NULL) {
265265 r = amdgpu_bo_create(adev, AMDGPU_GPU_PAGE_SIZE,
266266 PAGE_SIZE, true, AMDGPU_GEM_DOMAIN_VRAM,
267− AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,
267+ AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED |
268+ AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS,
268269 NULL, NULL, &adev->vram_scratch.robj);
269270 if (r) {
270271 return r;
drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c+2−1
@@ -152,7 +152,8 @@ static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev, · 151 unmodified lines
152152 aligned_size = ALIGN(size, PAGE_SIZE);
153153 ret = amdgpu_gem_object_create(adev, aligned_size, 0,
154154 AMDGPU_GEM_DOMAIN_VRAM,
155− AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,
155+ AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED |
156+ AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS,
156157 true, &gobj);
157158 if (ret) {
158159 printk(KERN_ERR "failed to allocate framebuffer (%d)\n",
drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c+2−1
@@ -126,7 +126,8 @@ int amdgpu_gart_table_vram_alloc(struct amdgpu_device *adev) · 125 unmodified lines
126126 if (adev->gart.robj == NULL) {
127127 r = amdgpu_bo_create(adev, adev->gart.table_size,
128128 PAGE_SIZE, true, AMDGPU_GEM_DOMAIN_VRAM,
129− AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,
129+ AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED |
130+ AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS,
130131 NULL, NULL, &adev->gart.robj);
131132 if (r) {
132133 return r;
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c+10−2
@@ -245,7 +245,8 @@ int amdgpu_bo_create_kernel(struct amdgpu_device *adev, · 244 unmodified lines
245245 int r;
246246
247247 r = amdgpu_bo_create(adev, size, align, true, domain,
248− AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,
248+ AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED |
249+ AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS,
249250 NULL, NULL, bo_ptr);
250251 if (r) {
251252 dev_err(adev->dev, "(%d) failed to allocate kernel bo\n", r);
@@ -643,6 +644,8 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain, · 391 unmodified lines
643644
644645 return 0;
645646 }
647+
648+ bo->flags |= AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS;
646649 amdgpu_ttm_placement_from_domain(bo, domain);
647650 for (i = 0; i < bo->placement.num_placement; i++) {
648651 /* force to pin into visible video ram */
@@ -885,7 +888,9 @@ int amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo) · 236 unmodified lines
885888
886889 size = bo->mem.num_pages << PAGE_SHIFT;
887890 offset = bo->mem.start << PAGE_SHIFT;
888− if ((offset + size) <= adev->mc.visible_vram_size)
891+ /* TODO: figure out how to map scattered VRAM to the CPU */
892+ if ((offset + size) <= adev->mc.visible_vram_size &&
893+ (abo->flags & AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS))
889894 return 0;
890895
891896 /* Can't move a pinned BO to visible VRAM */
@@ -893,6 +898,7 @@ int amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo) · 1 unmodified line
893898 return -EINVAL;
894899
895900 /* hurrah the memory is not visible ! */
901+ abo->flags |= AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS;
896902 amdgpu_ttm_placement_from_domain(abo, AMDGPU_GEM_DOMAIN_VRAM);
897903 lpfn = adev->mc.visible_vram_size >> PAGE_SHIFT;
898904 for (i = 0; i < abo->placement.num_placement; i++) {
@@ -954,6 +960,8 @@ u64 amdgpu_bo_gpu_offset(struct amdgpu_bo *bo) · 55 unmodified lines
954960 WARN_ON_ONCE(!ww_mutex_is_locked(&bo->tbo.resv->lock) &&
955961 !bo->pin_count);
956962 WARN_ON_ONCE(bo->tbo.mem.start == AMDGPU_BO_INVALID_OFFSET);
963+ WARN_ON_ONCE(bo->tbo.mem.mem_type == TTM_PL_VRAM &&
964+ !(bo->flags & AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS));
957965
958966 return bo->tbo.offset;
959967 }
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c+2−1
@@ -1119,7 +1119,8 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) · 1118 unmodified lines
11191119
11201120 r = amdgpu_bo_create(adev, 256 * 1024, PAGE_SIZE, true,
11211121 AMDGPU_GEM_DOMAIN_VRAM,
1122− AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,
1122+ AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED |
1123+ AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS,
11231124 NULL, NULL, &adev->stollen_vga_memory);
11241125 if (r) {
11251126 return r;
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c+4−2
@@ -1002,7 +1002,8 @@ int amdgpu_uvd_get_create_msg(struct amdgpu_ring *ring, uint32_t handle, · 1001 unmodified lines
10021002
10031003 r = amdgpu_bo_create(adev, 1024, PAGE_SIZE, true,
10041004 AMDGPU_GEM_DOMAIN_VRAM,
1005− AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,
1005+ AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED |
1006+ AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS,
10061007 NULL, NULL, &bo);
10071008 if (r)
10081009 return r;
@@ -1051,7 +1052,8 @@ int amdgpu_uvd_get_destroy_msg(struct amdgpu_ring *ring, uint32_t handle, · 42 unmodified lines
10511052
10521053 r = amdgpu_bo_create(adev, 1024, PAGE_SIZE, true,
10531054 AMDGPU_GEM_DOMAIN_VRAM,
1054− AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,
1055+ AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED |
1056+ AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS,
10551057 NULL, NULL, &bo);
10561058 if (r)
10571059 return r;
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c+2−1
@@ -157,7 +157,8 @@ int amdgpu_vce_sw_init(struct amdgpu_device *adev, unsigned long size) · 156 unmodified lines
157157
158158 r = amdgpu_bo_create(adev, size, PAGE_SIZE, true,
159159 AMDGPU_GEM_DOMAIN_VRAM,
160− AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,
160+ AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED |
161+ AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS,
161162 NULL, NULL, &adev->vce.vcpu_bo);
162163 if (r) {
163164 dev_err(adev->dev, "(%d) failed to allocate VCE bo\n", r);
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c+4−2
@@ -1416,7 +1416,8 @@ int amdgpu_vm_bo_map(struct amdgpu_device *adev, · 1415 unmodified lines
14161416 AMDGPU_GPU_PAGE_SIZE, true,
14171417 AMDGPU_GEM_DOMAIN_VRAM,
14181418 AMDGPU_GEM_CREATE_NO_CPU_ACCESS |
1419− AMDGPU_GEM_CREATE_SHADOW,
1419+ AMDGPU_GEM_CREATE_SHADOW |
1420+ AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS,
14201421 NULL, resv, &pt);
14211422 if (r)
14221423 goto error_free;
@@ -1626,7 +1627,8 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm) · 203 unmodified lines
16261627 r = amdgpu_bo_create(adev, pd_size, align, true,
16271628 AMDGPU_GEM_DOMAIN_VRAM,
16281629 AMDGPU_GEM_CREATE_NO_CPU_ACCESS |
1629− AMDGPU_GEM_CREATE_SHADOW,
1630+ AMDGPU_GEM_CREATE_SHADOW |
1631+ AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS,
16301632 NULL, NULL, &vm->page_directory);
16311633 if (r)
16321634 goto error_free_sched_entity;
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c+6−3
@@ -3391,7 +3391,8 @@ static int gfx_v7_0_rlc_init(struct amdgpu_device *adev) · 3390 unmodified lines
33913391 if (adev->gfx.rlc.save_restore_obj == NULL) {
33923392 r = amdgpu_bo_create(adev, dws * 4, PAGE_SIZE, true,
33933393 AMDGPU_GEM_DOMAIN_VRAM,
3394− AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,
3394+ AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED |
3395+ AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS,
33953396 NULL, NULL,
33963397 &adev->gfx.rlc.save_restore_obj);
33973398 if (r) {
@@ -3435,7 +3436,8 @@ static int gfx_v7_0_rlc_init(struct amdgpu_device *adev) · 37 unmodified lines
34353436 if (adev->gfx.rlc.clear_state_obj == NULL) {
34363437 r = amdgpu_bo_create(adev, dws * 4, PAGE_SIZE, true,
34373438 AMDGPU_GEM_DOMAIN_VRAM,
3438− AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,
3439+ AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED |
3440+ AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS,
34393441 NULL, NULL,
34403442 &adev->gfx.rlc.clear_state_obj);
34413443 if (r) {
@@ -3475,7 +3477,8 @@ static int gfx_v7_0_rlc_init(struct amdgpu_device *adev) · 33 unmodified lines
34753477 if (adev->gfx.rlc.cp_table_obj == NULL) {
34763478 r = amdgpu_bo_create(adev, adev->gfx.rlc.cp_table_size, PAGE_SIZE, true,
34773479 AMDGPU_GEM_DOMAIN_VRAM,
3478− AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,
3480+ AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED |
3481+ AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS,
34793482 NULL, NULL,
34803483 &adev->gfx.rlc.cp_table_obj);
34813484 if (r) {
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c+4−2
@@ -1273,7 +1273,8 @@ static int gfx_v8_0_rlc_init(struct amdgpu_device *adev) · 1272 unmodified lines
12731273 if (adev->gfx.rlc.clear_state_obj == NULL) {
12741274 r = amdgpu_bo_create(adev, dws * 4, PAGE_SIZE, true,
12751275 AMDGPU_GEM_DOMAIN_VRAM,
1276− AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,
1276+ AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED |
1277+ AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS,
12771278 NULL, NULL,
12781279 &adev->gfx.rlc.clear_state_obj);
12791280 if (r) {
@@ -1315,7 +1316,8 @@ static int gfx_v8_0_rlc_init(struct amdgpu_device *adev) · 35 unmodified lines
13151316 if (adev->gfx.rlc.cp_table_obj == NULL) {
13161317 r = amdgpu_bo_create(adev, adev->gfx.rlc.cp_table_size, PAGE_SIZE, true,
13171318 AMDGPU_GEM_DOMAIN_VRAM,
1318− AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,
1319+ AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED |
1320+ AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS,
13191321 NULL, NULL,
13201322 &adev->gfx.rlc.cp_table_obj);
13211323 if (r) {
include/uapi/drm/amdgpu_drm.h+2−0
@@ -81,6 +81,8 @@ extern "C" { · 80 unmodified lines
8181 #define AMDGPU_GEM_CREATE_VRAM_CLEARED (1 << 3)
8282 /* Flag that create shadow bo(GTT) while allocating vram bo */
8383 #define AMDGPU_GEM_CREATE_SHADOW (1 << 4)
84+/* Flag that allocating the BO should use linear VRAM */
85+#define AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS (1 << 5)
8486
8587 struct drm_amdgpu_gem_create_in {
8688 /** the requested memory size */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t