aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amdfalconx86/recipes-graphics/drm/files/0050-amdgpu-tests-Fiji-VCE-is-one-instance.patch
blob: b6221c0802edbc8aa8a53a77f6dafd13306a1f0d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
From c246e19bebdefd47f4d9f676391722ca5c98f2c2 Mon Sep 17 00:00:00 2001
From: Sonny Jiang <sonny.jiang@amd.com>
Date: Thu, 18 Feb 2016 10:59:56 -0500
Subject: [PATCH 050/117] amdgpu/tests: Fiji VCE is one instance

Change-Id: I7a00160cfa3510ae072964981c921bf49c707155
Signed-off-by: Sonny Jiang <sonny.jiang@amd.com>
Reviewed-by: Leo Liu <leo.liu@amd.com>
---
 tests/amdgpu/vce_tests.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/tests/amdgpu/vce_tests.c b/tests/amdgpu/vce_tests.c
index 32fc001..4915170 100644
--- a/tests/amdgpu/vce_tests.c
+++ b/tests/amdgpu/vce_tests.c
@@ -65,6 +65,7 @@ static amdgpu_device_handle device_handle;
 static uint32_t major_version;
 static uint32_t minor_version;
 static uint32_t family_id;
+static uint32_t vce_harvest_config;
 
 static amdgpu_context_handle context_handle;
 static amdgpu_bo_handle ib_handle;
@@ -97,6 +98,7 @@ int suite_vce_tests_init(void)
 		return CUE_SINIT_FAILED;
 
 	family_id = device_handle->info.family_id;
+	vce_harvest_config = device_handle->info.vce_harvest_config;
 
 	r = amdgpu_cs_ctx_create(device_handle, &context_handle);
 	if (r)
@@ -440,14 +442,16 @@ static void amdgpu_cs_vce_encode(void)
 		check_result(&enc);
 
 		/* two instances */
-		enc.two_instance = true;
-		vce_taskinfo[2] = 0x83;
-		vce_taskinfo[4] = 1;
-		amdgpu_cs_vce_encode_idr(&enc);
-		vce_taskinfo[2] = 0xffffffff;
-		vce_taskinfo[4] = 2;
-		amdgpu_cs_vce_encode_p(&enc);
-		check_result(&enc);
+		if (vce_harvest_config == 0) {
+			enc.two_instance = true;
+			vce_taskinfo[2] = 0x83;
+			vce_taskinfo[4] = 1;
+			amdgpu_cs_vce_encode_idr(&enc);
+			vce_taskinfo[2] = 0xffffffff;
+			vce_taskinfo[4] = 2;
+			amdgpu_cs_vce_encode_p(&enc);
+			check_result(&enc);
+		}
 	} else {
 		vce_taskinfo[3] = 3;
 		vce_encode[16] = 0;
-- 
2.7.4