Commit f7c157ca authored by Jammy Zhou's avatar Jammy Zhou Committed by Alex Deucher

amdgpu: reuse the kernel IB flags v2

v2: remove 'CE' from the preamble flag
Signed-off-by: default avatarJammy Zhou <Jammy.Zhou@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
parent 0aacadf1
......@@ -56,12 +56,6 @@ struct drm_amdgpu_info_hw_ip;
*/
#define AMDGPU_TIMEOUT_INFINITE 0xffffffffffffffffull
/**
* The special flag for GFX submission to identify that this is CE IB
* \sa amdgpu_cs_ib_info
*/
#define AMDGPU_CS_GFX_IB_CE 0x1
/**
* The special flag to mark that this IB will re-used
* by client and should not be automatically return back
......
......@@ -678,9 +678,7 @@ static int amdgpu_cs_submit_one(amdgpu_context_handle context,
chunk_data[i].ib_data.ip_type = ibs_request->ip_type;
chunk_data[i].ib_data.ip_instance = ibs_request->ip_instance;
chunk_data[i].ib_data.ring = ibs_request->ring;
if (ib->flags & AMDGPU_CS_GFX_IB_CE)
chunk_data[i].ib_data.flags = AMDGPU_IB_FLAG_CE;
chunk_data[i].ib_data.flags = ib->flags;
}
pthread_mutex_lock(&context->sequence_mutex);
......
......@@ -369,6 +369,9 @@ union drm_amdgpu_cs {
/* GDS is used by this IB */
#define AMDGPU_IB_FLAG_GDS (1<<1)
/* CE Preamble */
#define AMDGPU_IB_FLAG_PREAMBLE (1<<2)
struct drm_amdgpu_cs_chunk_ib {
/**
* Handle of GEM object to be used as IB or 0 if it is already in
......
......@@ -186,7 +186,7 @@ static void amdgpu_command_submission_gfx(void)
ptr[3] = 1;
ib_info[0].ib_handle = ib_result_ce.handle;
ib_info[0].size = 4;
ib_info[0].flags = AMDGPU_CS_GFX_IB_CE;
ib_info[0].flags = AMDGPU_IB_FLAG_CE;
/* IT_WAIT_ON_CE_COUNTER */
ptr = ib_result.cpu;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment