piglit: Update bbappend NXP 6.12.20-2.0.0

- Add GBM and Vulkan for DRM parts
- Remove x11 for 6 and 7
- Add pending patches

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
This commit is contained in:
Tom Hochstein 2025-08-15 14:02:25 -05:00
parent 0fa78aab19
commit e90033778b
3 changed files with 92 additions and 3 deletions

View File

@ -0,0 +1,30 @@
From c14b65106687b1097f5d50a993707d8a2f99005b Mon Sep 17 00:00:00 2001
From: jiajia Qian <jiajia.qian@nxp.com>
Date: Tue, 19 Dec 2023 13:23:33 +0800
Subject: [PATCH] tests: Fix cl test Include Directories: error : Error(0,8) :
Cannot find the header file include_test.h.
Modified CMakeLists.txt to install include_test.h file in piglit/tests/cl/program/build/ folder.
Modified the relative path in include-directories.cl from "tests/cl/program/build" to "../lib/piglit/tests/cl/program/build".
Upstream-Status: Pending [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/853]
Signed-off-by: jiajia Qian <jiajia.qian@nxp.com>
---
CMakeLists.txt | 1 +
tests/cl/program/build/include-directories.cl | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
Index: git/tests/cl/program/build/include-directories.cl
===================================================================
--- git.orig/tests/cl/program/build/include-directories.cl
+++ git/tests/cl/program/build/include-directories.cl
@@ -2,7 +2,7 @@
[config]
name: Include Directories
clc_version_min: 10
-build_options: -I . -I tests/cl/program/build
+build_options: -I . -I ../lib/piglit/tests/cl/program/build
!*/
#include "include_test.h"

View File

@ -0,0 +1,42 @@
From 2673c2adc81a408a4238f786cb2d795a65308ce6 Mon Sep 17 00:00:00 2001
From: Eric Guo <eric.guo@nxp.com>
Date: Fri, 11 Apr 2025 17:15:40 +0800
Subject: [PATCH] cl: Add mutually exclusive memory flags for
CL_MEM_KERNEL_READ_AND_WRITE
Fix cl-api-create-buffer on mali DDK.
Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/1004]
Signed-off-by: Eric Guo <eric.guo@nxp.com>
---
tests/util/piglit-util-cl-enum.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/tests/util/piglit-util-cl-enum.c b/tests/util/piglit-util-cl-enum.c
index 5d43bc102..f2c185c9c 100644
--- a/tests/util/piglit-util-cl-enum.c
+++ b/tests/util/piglit-util-cl-enum.c
@@ -979,7 +979,7 @@ PIGLIT_CL_DEFINE_ENUM_2(cl_command_queue_properties, 2, 2, 2, 4, 4 /* really? */
PIGLIT_CL_DEFINE_ENUM_PTR_2(cl_command_queue_properties);
-PIGLIT_CL_DEFINE_ENUM(cl_mem_flags, cl_mem_flags_mutexes, 5, 5, 8, 8, 8) = {
+PIGLIT_CL_DEFINE_ENUM(cl_mem_flags, cl_mem_flags_mutexes, 5, 5, 8, 11, 11) = {
CL_MEM_READ_WRITE | CL_MEM_READ_ONLY,
CL_MEM_READ_WRITE | CL_MEM_WRITE_ONLY,
CL_MEM_READ_ONLY | CL_MEM_WRITE_ONLY,
@@ -990,6 +990,11 @@ PIGLIT_CL_DEFINE_ENUM(cl_mem_flags, cl_mem_flags_mutexes, 5, 5, 8, 8, 8) = {
CL_MEM_HOST_WRITE_ONLY | CL_MEM_HOST_NO_ACCESS,
CL_MEM_HOST_READ_ONLY | CL_MEM_HOST_NO_ACCESS,
#endif //CL_VERSION_1_2
+#if defined(CL_VERSION_2_0)
+ CL_MEM_KERNEL_READ_AND_WRITE | CL_MEM_READ_ONLY,
+ CL_MEM_KERNEL_READ_AND_WRITE | CL_MEM_WRITE_ONLY,
+ CL_MEM_KERNEL_READ_AND_WRITE | CL_MEM_READ_WRITE,
+#endif //CL_VERSION_2_0
};
PIGLIT_CL_DEFINE_ENUM_PTR(cl_mem_flags, cl_mem_flags_mutexes);
--
2.34.1

View File

@ -1,6 +1,23 @@
PACKAGECONFIG:remove:imxgpu = "glx"
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
PACKAGECONFIG:append:mx8-nxp-bsp = " opencl"
PACKAGECONFIG:append:mx9-nxp-bsp = " opencl"
SRC_URI += "file://0001-tests-Fix-cl-test-Include-Directories-error-Error-0-.patch \
file://0002-cl-Add-mutually-exclusive-memory-flags-for-CL_MEM_KE.patch"
PACKAGECONFIG:append = " ${PACKAGECONFIG_APPEND}"
PACKAGECONFIG:remove = " ${PACKAGECONFIG_REMOVE}"
PACKAGECONFIG_APPEND ?= " \
gbm \
opencl \
${@bb.utils.filter('DISTRO_FEATURES', 'vulkan', d)}"
PACKAGECONFIG_APPEND:imxgpu:mx6-nxp-bsp = ""
PACKAGECONFIG_APPEND:imxgpu:mx7-nxp-bsp = ""
PACKAGECONFIG_REMOVE ?= ""
PACKAGECONFIG_REMOVE:imxgpu = "glx"
PACKAGECONFIG_REMOVE:imxgpu:mx6-nxp-bsp = "glx x11"
PACKAGECONFIG_REMOVE:imxgpu:mx7-nxp-bsp = "glx x11"
PACKAGECONFIG[gbm] = "-DPIGLIT_USE_GBM=1,-DPIGLIT_USE_GBM=0,virtual/libgbm"
CFLAGS:append:imxgpu:toolchain-clang = " -Wno-error=int-conversion"