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.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 935b9aa08474..5c55445f0260 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -796,6 +796,9 @@ enum amdgpu_ring_type {
796 796
797extern struct amd_sched_backend_ops amdgpu_sched_ops; 797extern struct amd_sched_backend_ops amdgpu_sched_ops;
798 798
799int amdgpu_job_alloc(struct amdgpu_device *adev, unsigned num_ibs,
800 struct amdgpu_job **job);
801void amdgpu_job_free(struct amdgpu_job *job);
799int amdgpu_sched_ib_submit_kernel_helper(struct amdgpu_device *adev, 802int amdgpu_sched_ib_submit_kernel_helper(struct amdgpu_device *adev,
800 struct amdgpu_ring *ring, 803 struct amdgpu_ring *ring,
801 struct amdgpu_ib *ibs, 804 struct amdgpu_ib *ibs,
@@ -1216,9 +1219,8 @@ struct amdgpu_cs_parser {
1216 unsigned nchunks; 1219 unsigned nchunks;
1217 struct amdgpu_cs_chunk *chunks; 1220 struct amdgpu_cs_chunk *chunks;
1218 1221
1219 /* indirect buffers */ 1222 /* scheduler job object */
1220 uint32_t num_ibs; 1223 struct amdgpu_job *job;
1221 struct amdgpu_ib *ibs;
1222 1224
1223 /* buffer objects */ 1225 /* buffer objects */
1224 struct ww_acquire_ctx ticket; 1226 struct ww_acquire_ctx ticket;
@@ -1249,14 +1251,14 @@ struct amdgpu_job {
1249static inline u32 amdgpu_get_ib_value(struct amdgpu_cs_parser *p, 1251static inline u32 amdgpu_get_ib_value(struct amdgpu_cs_parser *p,
1250 uint32_t ib_idx, int idx) 1252 uint32_t ib_idx, int idx)
1251{ 1253{
1252 return p->ibs[ib_idx].ptr[idx]; 1254 return p->job->ibs[ib_idx].ptr[idx];
1253} 1255}
1254 1256
1255static inline void amdgpu_set_ib_value(struct amdgpu_cs_parser *p, 1257static inline void amdgpu_set_ib_value(struct amdgpu_cs_parser *p,
1256 uint32_t ib_idx, int idx, 1258 uint32_t ib_idx, int idx,
1257 uint32_t value) 1259 uint32_t value)
1258{ 1260{
1259 p->ibs[ib_idx].ptr[idx] = value; 1261 p->job->ibs[ib_idx].ptr[idx] = value;
1260} 1262}
1261 1263
1262/* 1264/*