diff options
author | Christian König <christian.koenig@amd.com> | 2016-09-15 09:06:50 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-09-28 16:16:20 -0400 |
commit | 765e7fbf081d0e8bd22b35468a1c016358b46179 (patch) | |
tree | 47bf14c467cfec99984a0bd4283bf42b06df4063 /drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | |
parent | 1927ffc0c19d7d42f775604f6984933bbb0d419b (diff) |
drm/amdgpu: rename all rbo variable to abo v2
Just to cleanup some radeon leftovers.
sed -i "s/rbo/abo/g" drivers/gpu/drm/amd/amdgpu/*.c
sed -i "s/rbo/abo/g" drivers/gpu/drm/amd/amdgpu/*.h
v2: rebased
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c index f9f911623917..a7ea9a3b454e 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | |||
@@ -118,23 +118,23 @@ void amdgpu_gem_force_release(struct amdgpu_device *adev) | |||
118 | */ | 118 | */ |
119 | int amdgpu_gem_object_open(struct drm_gem_object *obj, struct drm_file *file_priv) | 119 | int amdgpu_gem_object_open(struct drm_gem_object *obj, struct drm_file *file_priv) |
120 | { | 120 | { |
121 | struct amdgpu_bo *rbo = gem_to_amdgpu_bo(obj); | 121 | struct amdgpu_bo *abo = gem_to_amdgpu_bo(obj); |
122 | struct amdgpu_device *adev = rbo->adev; | 122 | struct amdgpu_device *adev = abo->adev; |
123 | struct amdgpu_fpriv *fpriv = file_priv->driver_priv; | 123 | struct amdgpu_fpriv *fpriv = file_priv->driver_priv; |
124 | struct amdgpu_vm *vm = &fpriv->vm; | 124 | struct amdgpu_vm *vm = &fpriv->vm; |
125 | struct amdgpu_bo_va *bo_va; | 125 | struct amdgpu_bo_va *bo_va; |
126 | int r; | 126 | int r; |
127 | r = amdgpu_bo_reserve(rbo, false); | 127 | r = amdgpu_bo_reserve(abo, false); |
128 | if (r) | 128 | if (r) |
129 | return r; | 129 | return r; |
130 | 130 | ||
131 | bo_va = amdgpu_vm_bo_find(vm, rbo); | 131 | bo_va = amdgpu_vm_bo_find(vm, abo); |
132 | if (!bo_va) { | 132 | if (!bo_va) { |
133 | bo_va = amdgpu_vm_bo_add(adev, vm, rbo); | 133 | bo_va = amdgpu_vm_bo_add(adev, vm, abo); |
134 | } else { | 134 | } else { |
135 | ++bo_va->ref_count; | 135 | ++bo_va->ref_count; |
136 | } | 136 | } |
137 | amdgpu_bo_unreserve(rbo); | 137 | amdgpu_bo_unreserve(abo); |
138 | return 0; | 138 | return 0; |
139 | } | 139 | } |
140 | 140 | ||
@@ -547,7 +547,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, | |||
547 | struct drm_gem_object *gobj; | 547 | struct drm_gem_object *gobj; |
548 | struct amdgpu_device *adev = dev->dev_private; | 548 | struct amdgpu_device *adev = dev->dev_private; |
549 | struct amdgpu_fpriv *fpriv = filp->driver_priv; | 549 | struct amdgpu_fpriv *fpriv = filp->driver_priv; |
550 | struct amdgpu_bo *rbo; | 550 | struct amdgpu_bo *abo; |
551 | struct amdgpu_bo_va *bo_va; | 551 | struct amdgpu_bo_va *bo_va; |
552 | struct ttm_validate_buffer tv, tv_pd; | 552 | struct ttm_validate_buffer tv, tv_pd; |
553 | struct ww_acquire_ctx ticket; | 553 | struct ww_acquire_ctx ticket; |
@@ -587,10 +587,10 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, | |||
587 | gobj = drm_gem_object_lookup(filp, args->handle); | 587 | gobj = drm_gem_object_lookup(filp, args->handle); |
588 | if (gobj == NULL) | 588 | if (gobj == NULL) |
589 | return -ENOENT; | 589 | return -ENOENT; |
590 | rbo = gem_to_amdgpu_bo(gobj); | 590 | abo = gem_to_amdgpu_bo(gobj); |
591 | INIT_LIST_HEAD(&list); | 591 | INIT_LIST_HEAD(&list); |
592 | INIT_LIST_HEAD(&duplicates); | 592 | INIT_LIST_HEAD(&duplicates); |
593 | tv.bo = &rbo->tbo; | 593 | tv.bo = &abo->tbo; |
594 | tv.shared = true; | 594 | tv.shared = true; |
595 | list_add(&tv.head, &list); | 595 | list_add(&tv.head, &list); |
596 | 596 | ||
@@ -604,7 +604,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, | |||
604 | return r; | 604 | return r; |
605 | } | 605 | } |
606 | 606 | ||
607 | bo_va = amdgpu_vm_bo_find(&fpriv->vm, rbo); | 607 | bo_va = amdgpu_vm_bo_find(&fpriv->vm, abo); |
608 | if (!bo_va) { | 608 | if (!bo_va) { |
609 | ttm_eu_backoff_reservation(&ticket, &list); | 609 | ttm_eu_backoff_reservation(&ticket, &list); |
610 | drm_gem_object_unreference_unlocked(gobj); | 610 | drm_gem_object_unreference_unlocked(gobj); |