aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index c23eea308991..dd6dd23fb3c7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -771,7 +771,6 @@ struct amdgpu_ib {
771 uint32_t length_dw; 771 uint32_t length_dw;
772 uint64_t gpu_addr; 772 uint64_t gpu_addr;
773 uint32_t *ptr; 773 uint32_t *ptr;
774 struct amdgpu_ring *ring;
775 struct amdgpu_fence *fence; 774 struct amdgpu_fence *fence;
776 struct amdgpu_user_fence *user; 775 struct amdgpu_user_fence *user;
777 bool grabbed_vmid; 776 bool grabbed_vmid;
@@ -1178,10 +1177,10 @@ struct amdgpu_gfx {
1178 unsigned ce_ram_size; 1177 unsigned ce_ram_size;
1179}; 1178};
1180 1179
1181int amdgpu_ib_get(struct amdgpu_ring *ring, struct amdgpu_vm *vm, 1180int amdgpu_ib_get(struct amdgpu_device *adev, struct amdgpu_vm *vm,
1182 unsigned size, struct amdgpu_ib *ib); 1181 unsigned size, struct amdgpu_ib *ib);
1183void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib); 1182void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib);
1184int amdgpu_ib_schedule(struct amdgpu_device *adev, unsigned num_ibs, 1183int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
1185 struct amdgpu_ib *ib, void *owner); 1184 struct amdgpu_ib *ib, void *owner);
1186int amdgpu_ib_pool_init(struct amdgpu_device *adev); 1185int amdgpu_ib_pool_init(struct amdgpu_device *adev);
1187void amdgpu_ib_pool_fini(struct amdgpu_device *adev); 1186void amdgpu_ib_pool_fini(struct amdgpu_device *adev);
@@ -1239,6 +1238,7 @@ struct amdgpu_cs_parser {
1239struct amdgpu_job { 1238struct amdgpu_job {
1240 struct amd_sched_job base; 1239 struct amd_sched_job base;
1241 struct amdgpu_device *adev; 1240 struct amdgpu_device *adev;
1241 struct amdgpu_ring *ring;
1242 struct amdgpu_ib *ibs; 1242 struct amdgpu_ib *ibs;
1243 uint32_t num_ibs; 1243 uint32_t num_ibs;
1244 void *owner; 1244 void *owner;