aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu.h
diff options
context:
space:
mode:
authorChunming Zhou <david1.zhou@amd.com>2015-07-21 03:53:04 -0400
committerAlex Deucher <alexander.deucher@amd.com>2015-08-17 16:50:35 -0400
commit4b559c90bc1870313f02cceef680884519af6b2b (patch)
tree7445ec7982f1fac5e517097bedd72cc752c41889 /drivers/gpu/drm/amd/amdgpu/amdgpu.h
parentb43a9a7e87d2bbb8d0c6ae4ff06dcc604f00e31a (diff)
drm/amdgpu: make sure the fence is emitted before ring to get it.
Signed-off-by: Chunming Zhou <david1.zhou@amd.com> Acked-by: Christian K?nig <christian.koenig@amd.com> Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index becb26317467..127867c2fc37 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -81,6 +81,7 @@ extern int amdgpu_vm_size;
81extern int amdgpu_vm_block_size; 81extern int amdgpu_vm_block_size;
82extern int amdgpu_enable_scheduler; 82extern int amdgpu_enable_scheduler;
83 83
84#define AMDGPU_WAIT_IDLE_TIMEOUT_IN_MS 3000
84#define AMDGPU_MAX_USEC_TIMEOUT 100000 /* 100 ms */ 85#define AMDGPU_MAX_USEC_TIMEOUT 100000 /* 100 ms */
85#define AMDGPU_FENCE_JIFFIES_TIMEOUT (HZ / 2) 86#define AMDGPU_FENCE_JIFFIES_TIMEOUT (HZ / 2)
86/* AMDGPU_IB_POOL_SIZE must be a power of 2 */ 87/* AMDGPU_IB_POOL_SIZE must be a power of 2 */
@@ -1239,6 +1240,7 @@ struct amdgpu_cs_parser {
1239 /* user fence */ 1240 /* user fence */
1240 struct amdgpu_user_fence uf; 1241 struct amdgpu_user_fence uf;
1241 1242
1243 struct amdgpu_ring *ring;
1242 struct mutex job_lock; 1244 struct mutex job_lock;
1243 struct work_struct job_work; 1245 struct work_struct job_work;
1244 int (*prepare_job)(struct amdgpu_cs_parser *sched_job); 1246 int (*prepare_job)(struct amdgpu_cs_parser *sched_job);