package/libdrm: fix build without fork
PATCH 1/1 package/libdrm: fix build without fork
Fixes:
- http://autobuild.buildroot.org/results/8d6194982c1080e173fcef8212fb06e6dc275d58
--- ...-amdgpu-basic_tests.c-check-for-fork.patch | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 package/libdrm/0004-amdgpu-basic_tests.c-check-for-fork.patch
package/libdrm/0004-amdgpu-basic_tests.c-check-for-fork.patch new file +64 -0
@@ -0,0 +1,64 @@ +From a5ba5f3c194aa68b1e944d6691ad5cbbb2766ba7 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <[email protected]> +Date: Sun, 10 Mar 2019 09:44:11 +0100 +Subject: [PATCH libdrm] amdgpu/basic_tests.c: check for fork + +amdgpu test program use fork since +https://cgit.freedesktop.org/mesa/drm/commit/tests/amdgpu/basic_tests.c?id=736ef0b61cab55378202c5f49d91799cc2b99091 + +However, this function is not always available so add a check for it in +configure.ac and use it in tests/amdgpu/basic_tests.c + +Fixes: + - http://autobuild.buildroot.org/results/8d6194982c1080e173fcef8212fb06e6dc275d58 + +Signed-off-by: Fabrice Fontaine <[email protected]> +[Upstream status: sent to dri-devel at lists.freedesktop.org] +--- + configure.ac | 2 ++ + tests/amdgpu/basic_tests.c | 4 ++++ + 2 files changed, 6 insertions(+) + +diff --git a/configure.ac b/configure.ac +index d72e84ad..6effb9a2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -193,6 +193,8 @@ AC_CHECK_FUNCS([open_memstream], + [AC_DEFINE([HAVE_OPEN_MEMSTREAM], 1, [Have open_memstream()])], + [AC_DEFINE([HAVE_OPEN_MEMSTREAM], 0)]) + ++AC_CHECK_FUNCS([fork]) ++ + dnl Use lots of warning flags with with gcc and compatible compilers + + dnl Note: if you change the following variable, the cache is automatically +diff --git a/tests/amdgpu/basic_tests.c b/tests/amdgpu/basic_tests.c +index dbae4d53..c32a1351 100644 +--- a/tests/amdgpu/basic_tests.c ++++ b/tests/amdgpu/basic_tests.c +@@ -1646,10 +1646,12 @@ static void amdgpu_userptr_test(void) + while (j++ < sdma_write_length) + pm4[i++] = 0xdeadbeaf; + ++#ifdef HAVE_FORK + if (!fork()) { + pm4[0] = 0x0; + exit(0); + } ++#endif + + amdgpu_test_exec_cs_helper(context_handle, + AMDGPU_HW_IP_DMA, 0, +@@ -1675,7 +1677,9 @@ static void amdgpu_userptr_test(void) + r = amdgpu_cs_ctx_free(context_handle); + CU_ASSERT_EQUAL(r, 0); + ++#ifdef HAVE_FORK + wait(NULL); ++#endif + } + + static void amdgpu_sync_dependency_test(void) +-- +2.20.1 +
Signature · 1 line
2.20.1
PATCH 1/1 package/libdrm: fix build without fork
Hello Fabrice,
Quoted 15 lines · Fabrice Fontaine
Fixes:
- http://autobuild.buildroot.org/results/8d6194982c1080e173fcef8212fb06e6dc275d58Signed-off-by Fabrice Fontaine <[email protected]>--- ...-amdgpu-basic_tests.c-check-for-fork.patch | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 package/libdrm/0004-amdgpu-basic_tests.c-check-for-fork.patchpackage/libdrm/0004-amdgpu-basic_tests.c-check-for-fork.patch new file +0
-0
package/libdrm/0004-amdgpu-basic_tests.c-check-for-fork.patch line 10
Quoted 10 lines
package/libdrm/0004-amdgpu-basic_tests.c-check-for-fork.patch new file +10
-0@@ -0,0 +1,64 @@ +From a5ba5f3c194aa68b1e944d6691ad5cbbb2766ba7 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <[email protected]> +Date: Sun, 10 Mar 2019 09:44:11 +0100 +Subject: [PATCH libdrm] amdgpu/basic_tests.c: check for fork + +amdgpu test program use fork since +https://cgit.freedesktop.org/mesa/drm/commit/tests/amdgpu/basic_tests.c?id=736ef0b61cab55378202c5f49d91799cc2b99091 + +However, this function is not always available so add a check for it in +configure.ac and use it in tests/amdgpu/basic_tests.c
Will the test succeed without fork? Maybe better disable the whole test in case fork is not available? Or simple wait for Upstream suggestions/opinion.... ;-)
Regards,
Peter
Quoted 54 lines
package/libdrm/0004-amdgpu-basic_tests.c-check-for-fork.patch new file +54
-0+ +Fixes: + - http://autobuild.buildroot.org/results/8d6194982c1080e173fcef8212fb06e6dc275d58 + +Signed-off-by: Fabrice Fontaine <[email protected]> +[Upstream status: sent to dri-devel at lists.freedesktop.org] +--- + configure.ac | 2 ++ + tests/amdgpu/basic_tests.c | 4 ++++ + 2 files changed, 6 insertions(+) + +diff --git a/configure.ac b/configure.ac +index d72e84ad..6effb9a2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -193,6 +193,8 @@ AC_CHECK_FUNCS([open_memstream], + [AC_DEFINE([HAVE_OPEN_MEMSTREAM], 1, [Have open_memstream()])], + [AC_DEFINE([HAVE_OPEN_MEMSTREAM], 0)]) + ++AC_CHECK_FUNCS([fork]) ++ + dnl Use lots of warning flags with with gcc and compatible compilers + + dnl Note: if you change the following variable, the cache is automatically +diff --git a/tests/amdgpu/basic_tests.c b/tests/amdgpu/basic_tests.c +index dbae4d53..c32a1351 100644 +--- a/tests/amdgpu/basic_tests.c ++++ b/tests/amdgpu/basic_tests.c +@@ -1646,10 +1646,12 @@ static void amdgpu_userptr_test(void) + while (j++ < sdma_write_length) + pm4[i++] = 0xdeadbeaf; + ++#ifdef HAVE_FORK + if (!fork()) { + pm4[0] = 0x0; + exit(0); + } ++#endif + + amdgpu_test_exec_cs_helper(context_handle, + AMDGPU_HW_IP_DMA, 0, +@@ -1675,7 +1677,9 @@ static void amdgpu_userptr_test(void) + r = amdgpu_cs_ctx_free(context_handle); + CU_ASSERT_EQUAL(r, 0); + ++#ifdef HAVE_FORK + wait(NULL); ++#endif + } + + static void amdgpu_sync_dependency_test(void) +-- +2.20.1 +
PATCH 1/1 package/libdrm: fix build without fork
Hello Peter,
Le dim. 10 mars 2019 ? 19:18, Peter Seiderer <[email protected]> a ?crit :
Quoted 25 lines
Hello Fabrice,
Quoted 20 lines · Fabrice Fontaine
Fixes:
- http://autobuild.buildroot.org/results/8d6194982c1080e173fcef8212fb06e6dc275d58Signed-off-by Fabrice Fontaine <[email protected]>--- ...-amdgpu-basic_tests.c-check-for-fork.patch | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 package/libdrm/0004-amdgpu-basic_tests.c-check-for-fork.patchpackage/libdrm/0004-amdgpu-basic_tests.c-check-for-fork.patch new file +5
-0@@ -0,0 +1,64 @@ +From a5ba5f3c194aa68b1e944d6691ad5cbbb2766ba7 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <[email protected]> +Date: Sun, 10 Mar 2019 09:44:11 +0100 +Subject: [PATCH libdrm] amdgpu/basic_tests.c: check for fork +
Quoted 8 lines
package/libdrm/0004-amdgpu-basic_tests.c-check-for-fork.patch line 10
Quoted 5 lines
package/libdrm/0004-amdgpu-basic_tests.c-check-for-fork.patch new file +5
-0+amdgpu test program use fork since +https://cgit.freedesktop.org/mesa/drm/commit/tests/amdgpu/basic_tests.c?id=736ef0b61cab55378202c5f49d91799cc2b99091 + +However, this function is not always available so add a check for it in +configure.ac and use it in tests/amdgpu/basic_tests.cWill the test succeed without fork? Maybe better disable the whole test in case fork is not available? Or simple wait for Upstream suggestions/opinion.... ;-)
Indeed, you were right, the test won't succeed but upstream does not want to disable the test either:
https://patchwork.freedesktop.org/patch/291508.
Should we add a dependency on BR2_USE_MMU to libdrm and all its reverse dependencies?
Quoted 50 lines
Regards,
PeterQuoted 46 lines
package/libdrm/0004-amdgpu-basic_tests.c-check-for-fork.patch new file +46
-0+ +Fixes: + - http://autobuild.buildroot.org/results/8d6194982c1080e173fcef8212fb06e6dc275d58 + +Signed-off-by: Fabrice Fontaine <[email protected]> +[Upstream status: sent to dri-devel at lists.freedesktop.org] +--- + configure.ac | 2 ++ + tests/amdgpu/basic_tests.c | 4 ++++ + 2 files changed, 6 insertions(+) + +diff --git a/configure.ac b/configure.ac +index d72e84ad..6effb9a2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -193,6 +193,8 @@ AC_CHECK_FUNCS([open_memstream], + [AC_DEFINE([HAVE_OPEN_MEMSTREAM], 1, [Have open_memstream()])], + [AC_DEFINE([HAVE_OPEN_MEMSTREAM], 0)]) + ++AC_CHECK_FUNCS([fork]) ++ + dnl Use lots of warning flags with with gcc and compatible compilers + + dnl Note: if you change the following variable, the cache is automatically +diff --git a/tests/amdgpu/basic_tests.c b/tests/amdgpu/basic_tests.c +index dbae4d53..c32a1351 100644 +--- a/tests/amdgpu/basic_tests.c ++++ b/tests/amdgpu/basic_tests.c +@@ -1646,10 +1646,12 @@ static void amdgpu_userptr_test(void) + while (j++ < sdma_write_length) + pm4[i++] = 0xdeadbeaf; + ++#ifdef HAVE_FORK + if (!fork()) { + pm4[0] = 0x0; + exit(0); + } ++#endif + + amdgpu_test_exec_cs_helper(context_handle, + AMDGPU_HW_IP_DMA, 0, +@@ -1675,7 +1677,9 @@ static void amdgpu_userptr_test(void) + r = amdgpu_cs_ctx_free(context_handle); + CU_ASSERT_EQUAL(r, 0); + ++#ifdef HAVE_FORK
Quoted 9 lines
package/libdrm/0004-amdgpu-basic_tests.c-check-for-fork.patch line 64
Quoted 8 lines
package/libdrm/0004-amdgpu-basic_tests.c-check-for-fork.patch new file +8
-0+ wait(NULL); ++#endif + } + + static void amdgpu_sync_dependency_test(void) +-- +2.20.1 +
Best Regards,
Fabrice
PATCH 1/1 package/libdrm: fix build without fork
Hello,
Quoted 7 lines · On Mon, 11 Mar 2019 18:52:37 +0100 Fabrice Fontaine…
Quoted 2 lines
Will the test succeed without fork? Maybe better disable the whole test in case fork is not available? Or simple wait for Upstream suggestions/opinion.... ;-)
Indeed, you were right, the test won't succeed but upstream does not want to disable the test either:
https://patchwork.freedesktop.org/patch/291508.
Should we add a dependency onBR2_USE_MMUto libdrm and all its reverse dependencies?
Why on libdrm ?
As upstream said: amdgpu is never going to be used on noMMU platforms, and the amdgpu tests are only compiled in when the amdgpu driver is enabled. From tests/Makefile.am:
if HAVE_AMDGPU
if HAVE_CUNIT
SUBDIRS += amdgpu
endif
endif
So, just make BR2_PACKAGE_LIBDRM_AMDGPU depends on BR2_USE_MMU. Isn't that sufficient ?
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/libdrm: fix build without fork
Dear Thomas,
Le lun. 11 mars 2019 ? 22:54, Thomas Petazzoni
<[email protected]> a ?crit :
Quoted 20 lines
Hello,
Quoted 7 lines · On Mon, 11 Mar 2019 18:52:37 +0100 Fabrice Fontaine…
Quoted 2 lines
Will the test succeed without fork? Maybe better disable the whole test in case fork is not available? Or simple wait for Upstream suggestions/opinion.... ;-)
Indeed, you were right, the test won't succeed but upstream does not want to disable the test either:
https://patchwork.freedesktop.org/patch/291508.
Should we add a dependency onBR2_USE_MMUto libdrm and all its reverse dependencies?Why on libdrm ?
As upstream said: amdgpu is never going to be used on noMMU platforms, and the amdgpu tests are only compiled in when the amdgpu driver is enabled. From tests/Makefile.am:
Quoted 8 lines
if
HAVE_AMDGPU
ifHAVE_CUNIT
SUBDIRS += amdgpu
endif
endifSo, just make
BR2_PACKAGE_LIBDRM_AMDGPUdepends onBR2_USE_MMU. Isn't that sufficient ?
Indeed, I missed this one, I'll send a new patch.
Quoted 8 lines
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Best Regards,
Fabrice