summaryrefslogtreecommitdiff
path: root/tests/amdgpu
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2015-05-29 19:13:41 +0200
committerAlex Deucher <alexander.deucher@amd.com>2015-08-05 13:47:50 -0400
commit194d5c2ee442b0f5020b33dd419f0b4d9e6b9001 (patch)
tree7002d9593cbbdad2bc9d0d914e1ecff9df6f9d02 /tests/amdgpu
parent2a344a8d8a7af0b242b262866742c253cd55d334 (diff)
amdgpu: remove amdgpu_ib
Not useful if we're gonna use BO handles directly. Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com>
Diffstat (limited to 'tests/amdgpu')
-rw-r--r--tests/amdgpu/basic_tests.c12
-rw-r--r--tests/amdgpu/cs_tests.c4
-rw-r--r--tests/amdgpu/vce_tests.c4
3 files changed, 10 insertions, 10 deletions
diff --git a/tests/amdgpu/basic_tests.c b/tests/amdgpu/basic_tests.c
index 0ae25d6f..66847b5f 100644
--- a/tests/amdgpu/basic_tests.c
+++ b/tests/amdgpu/basic_tests.c
@@ -184,7 +184,7 @@ static void amdgpu_command_submission_gfx_separate_ibs(void)
ptr[1] = 0;
ptr[2] = 0xc0008400;
ptr[3] = 1;
- ib_info[0].ib_handle = ib_result_ce.handle;
+ ib_info[0].bo_handle = ib_result_ce.handle;
ib_info[0].size = 4;
ib_info[0].flags = AMDGPU_IB_FLAG_CE;
@@ -192,7 +192,7 @@ static void amdgpu_command_submission_gfx_separate_ibs(void)
ptr = ib_result.cpu;
ptr[0] = 0xc0008600;
ptr[1] = 0x00000001;
- ib_info[1].ib_handle = ib_result.handle;
+ ib_info[1].bo_handle = ib_result.handle;
ib_info[1].size = 2;
ibs_request.ip_type = AMDGPU_HW_IP_GFX;
@@ -246,14 +246,14 @@ static void amdgpu_command_submission_gfx_shared_ib(void)
ptr[1] = 0;
ptr[2] = 0xc0008400;
ptr[3] = 1;
- ib_info[0].ib_handle = ib_result.handle;
+ ib_info[0].bo_handle = ib_result.handle;
ib_info[0].size = 4;
ib_info[0].flags = AMDGPU_IB_FLAG_CE;
ptr = (uint32_t *)ib_result.cpu + 4;
ptr[0] = 0xc0008600;
ptr[1] = 0x00000001;
- ib_info[1].ib_handle = ib_result.handle;
+ ib_info[1].bo_handle = ib_result.handle;
ib_info[1].size = 2;
ib_info[1].offset_dw = 4;
@@ -312,7 +312,7 @@ static void amdgpu_command_submission_compute(void)
ptr[i] = 0xffff1000;
memset(&ib_info, 0, sizeof(struct amdgpu_cs_ib_info));
- ib_info.ib_handle = ib_result.handle;
+ ib_info.bo_handle = ib_result.handle;
ib_info.size = 16;
memset(&ibs_request, 0, sizeof(struct amdgpu_cs_request));
@@ -375,7 +375,7 @@ static void amdgpu_sdma_test_exec_cs(amdgpu_context_handle context_handle,
ring_ptr = ib_result.cpu;
memcpy(ring_ptr, pm4_src, pm4_dw * sizeof(*pm4_src));
- ib_info->ib_handle = ib_result.handle;
+ ib_info->bo_handle = ib_result.handle;
ib_info->size = pm4_dw;
ibs_request->ip_type = AMDGPU_HW_IP_DMA;
diff --git a/tests/amdgpu/cs_tests.c b/tests/amdgpu/cs_tests.c
index 5fb11b18..81d5e58e 100644
--- a/tests/amdgpu/cs_tests.c
+++ b/tests/amdgpu/cs_tests.c
@@ -40,7 +40,7 @@ static uint32_t minor_version;
static uint32_t family_id;
static amdgpu_context_handle context_handle;
-static amdgpu_ib_handle ib_handle;
+static amdgpu_bo_handle ib_handle;
uint32_t *ib_cpu;
static amdgpu_bo_handle resources[MAX_RESOURCES];
@@ -111,7 +111,7 @@ static int submit(unsigned ndw, unsigned ip)
uint32_t expired;
int r;
- ib_info.ib_handle = ib_handle;
+ ib_info.bo_handle = ib_handle;
ib_info.size = ndw;
ibs_request.ip_type = ip;
diff --git a/tests/amdgpu/vce_tests.c b/tests/amdgpu/vce_tests.c
index aaa29f6e..99aebc97 100644
--- a/tests/amdgpu/vce_tests.c
+++ b/tests/amdgpu/vce_tests.c
@@ -61,7 +61,7 @@ static uint32_t minor_version;
static uint32_t family_id;
static amdgpu_context_handle context_handle;
-static amdgpu_ib_handle ib_handle;
+static amdgpu_bo_handle ib_handle;
uint32_t *ib_cpu;
struct amdgpu_vce_encode enc;
@@ -135,7 +135,7 @@ static int submit(unsigned ndw, unsigned ip)
uint32_t expired;
int r;
- ib_info.ib_handle = ib_handle;
+ ib_info.bo_handle = ib_handle;
ib_info.size = ndw;
ibs_request.ip_type = ip;