From af871ec1a6f017b782943a11fb1c06b18c41bfe3 Mon Sep 17 00:00:00 2001 From: Lang Yu Date: Wed, 24 Mar 2021 12:18:41 +0800 Subject: [PATCH] drm/tests/amdgpu: fix Metadata test failed issue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The unit of size_metadata is one byte not four bytes. Enable Metadata test. Signed-off-by: Lang Yu Signed-off-by: Marek Olšák --- tests/amdgpu/amdgpu_test.c | 3 --- tests/amdgpu/bo_tests.c | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/tests/amdgpu/amdgpu_test.c b/tests/amdgpu/amdgpu_test.c index 8c867678..77bbfbcc 100644 --- a/tests/amdgpu/amdgpu_test.c +++ b/tests/amdgpu/amdgpu_test.c @@ -496,9 +496,6 @@ static void amdgpu_disable_suites() "gfx ring slow bad draw test (set amdgpu.lockup_timeout=50)", CU_FALSE)) fprintf(stderr, "test deactivation failed - %s\n", CU_get_error_msg()); - if (amdgpu_set_test_active(BO_TESTS_STR, "Metadata", CU_FALSE)) - fprintf(stderr, "test deactivation failed - %s\n", CU_get_error_msg()); - if (amdgpu_set_test_active(BASIC_TESTS_STR, "bo eviction Test", CU_FALSE)) fprintf(stderr, "test deactivation failed - %s\n", CU_get_error_msg()); diff --git a/tests/amdgpu/bo_tests.c b/tests/amdgpu/bo_tests.c index 4c11665a..8fc7fe26 100644 --- a/tests/amdgpu/bo_tests.c +++ b/tests/amdgpu/bo_tests.c @@ -168,7 +168,7 @@ static void amdgpu_bo_metadata(void) struct amdgpu_bo_info info = {0}; int r; - meta.size_metadata = 1; + meta.size_metadata = 4; meta.umd_metadata[0] = 0xdeadbeef; r = amdgpu_bo_set_metadata(buffer_handle, &meta); @@ -177,7 +177,7 @@ static void amdgpu_bo_metadata(void) r = amdgpu_bo_query_info(buffer_handle, &info); CU_ASSERT_EQUAL(r, 0); - CU_ASSERT_EQUAL(info.metadata.size_metadata, 1); + CU_ASSERT_EQUAL(info.metadata.size_metadata, 4); CU_ASSERT_EQUAL(info.metadata.umd_metadata[0], 0xdeadbeef); }