package/intel-mediadriver: fix build with gcc 10
PATCH 1/3 package/intel-mediadriver: fix build with gcc 10
Fixes:
- http://autobuild.buildroot.org/results/d5ab36026a66a4f371fb6ef6c9ecf43e9617d119
--- ...-Werror=format-overflow-under-gcc-10.patch | 162 ++++++++++++++++++ 1 file changed, 162 insertions(+) create mode 100644 package/intel-mediadriver/0002-build-fix-Werror=format-overflow-under-gcc-10.patch
package/intel-mediadriver/0002-build-fix-Werror=format-overflow-under-gcc-10.patch new file +162 -0
@@ -0,0 +1,162 @@ +From da966a2ab1f5161cc0a21a4cd7e07edf732ebee9 Mon Sep 17 00:00:00 2001 +From: Dmitry Rogozhkin <[email protected]> +Date: Thu, 19 Mar 2020 20:59:12 -0700 +Subject: [PATCH] build: fix Werror=format-overflow under gcc-10 + +Fixes: #870 + +With upcoming gcc-10 we start to see Werror=format-overflow reporting +that we attempt to printf %s null strings. + +Change-Id: I7a62bc98bf7dd6bcd61d475d7650a06aa1a70932 +Signed-off-by: Dmitry Rogozhkin <[email protected]> +[Retrieved from: +https://github.com/intel/media-driver/commit/da966a2ab1f5161cc0a21a4cd7e07edf732ebee9] +Signed-off-by: Fabrice Fontaine <[email protected]> +--- + media_driver/linux/common/os/i915/xf86drm.c | 57 ++++++++++--------- + .../linux/ult/libdrm_mock/xf86drm_mock.c | 57 ++++++++++--------- + 2 files changed, 58 insertions(+), 56 deletions(-) + +diff --git a/media_driver/linux/common/os/i915/xf86drm.c b/media_driver/linux/common/os/i915/xf86drm.c +index 7594bde99..d0fc1b7ac 100644 +--- a/media_driver/linux/common/os/i915/xf86drm.c ++++ b/media_driver/linux/common/os/i915/xf86drm.c +@@ -581,37 +581,38 @@ static int drmOpenByBusid(const char *busid, int type) + + drmMsg("drmOpenByBusid: Searching for BusID %s\n", busid); + for (i = base; i < base + DRM_MAX_MINOR; i++) { +- fd = drmOpenMinor(i, 1, type); +- drmMsg("drmOpenByBusid: drmOpenMinor returns %d\n", fd); +- if (fd >= 0) { +- /* We need to try for 1.4 first for proper PCI domain support +- * and if that fails, we know the kernel is busted +- */ +- sv.drm_di_major = 1; +- sv.drm_di_minor = 4; +- sv.drm_dd_major = -1; /* Don't care */ +- sv.drm_dd_minor = -1; /* Don't care */ +- if (drmSetInterfaceVersion(fd, &sv)) { ++ fd = drmOpenMinor(i, 1, type); ++ drmMsg("drmOpenByBusid: drmOpenMinor returns %d\n", fd); ++ if (fd >= 0) { ++ /* We need to try for 1.4 first for proper PCI domain support ++ * and if that fails, we know the kernel is busted ++ */ ++ sv.drm_di_major = 1; ++ sv.drm_di_minor = 4; ++ sv.drm_dd_major = -1; /* Don't care */ ++ sv.drm_dd_minor = -1; /* Don't care */ ++ if (drmSetInterfaceVersion(fd, &sv)) { + #ifndef __alpha__ +- pci_domain_ok = 0; ++ pci_domain_ok = 0; + #endif +- sv.drm_di_major = 1; +- sv.drm_di_minor = 1; +- sv.drm_dd_major = -1; /* Don't care */ +- sv.drm_dd_minor = -1; /* Don't care */ +- drmMsg("drmOpenByBusid: Interface 1.4 failed, trying 1.1\n"); +- drmSetInterfaceVersion(fd, &sv); +- } +- buf = drmGetBusid(fd); +- drmMsg("drmOpenByBusid: drmGetBusid reports %s\n", buf); +- if (buf && drmMatchBusID(buf, busid, pci_domain_ok)) { +- drmFreeBusid(buf); +- return fd; ++ sv.drm_di_major = 1; ++ sv.drm_di_minor = 1; ++ sv.drm_dd_major = -1; /* Don't care */ ++ sv.drm_dd_minor = -1; /* Don't care */ ++ drmMsg("drmOpenByBusid: Interface 1.4 failed, trying 1.1\n"); ++ drmSetInterfaceVersion(fd, &sv); ++ } ++ buf = drmGetBusid(fd); ++ if (buf) { ++ drmMsg("drmOpenByBusid: drmGetBusid reports %s\n", buf); ++ if (drmMatchBusID(buf, busid, pci_domain_ok)) { ++ drmFreeBusid(buf); ++ return fd; ++ } ++ drmFreeBusid(buf); ++ } ++ close(fd); + } +- if (buf) +- drmFreeBusid(buf); +- close(fd); +- } + } + return -1; + } +diff --git a/media_driver/linux/ult/libdrm_mock/xf86drm_mock.c b/media_driver/linux/ult/libdrm_mock/xf86drm_mock.c +index 7e5246295..2e5863798 100644 +--- a/media_driver/linux/ult/libdrm_mock/xf86drm_mock.c ++++ b/media_driver/linux/ult/libdrm_mock/xf86drm_mock.c +@@ -790,37 +790,38 @@ static int drmOpenByBusid(const char *busid, int type) + + drmMsg("drmOpenByBusid: Searching for BusID %s\n", busid); + for (i = base; i < base + DRM_MAX_MINOR; i++) { +- fd = drmOpenMinor(i, 1, type); +- drmMsg("drmOpenByBusid: drmOpenMinor returns %d\n", fd); +- if (fd >= 0) { +- /* We need to try for 1.4 first for proper PCI domain support +- * and if that fails, we know the kernel is busted +- */ +- sv.drm_di_major = 1; +- sv.drm_di_minor = 4; +- sv.drm_dd_major = -1; /* Don't care */ +- sv.drm_dd_minor = -1; /* Don't care */ +- if (drmSetInterfaceVersion(fd, &sv)) { ++ fd = drmOpenMinor(i, 1, type); ++ drmMsg("drmOpenByBusid: drmOpenMinor returns %d\n", fd); ++ if (fd >= 0) { ++ /* We need to try for 1.4 first for proper PCI domain support ++ * and if that fails, we know the kernel is busted ++ */ ++ sv.drm_di_major = 1; ++ sv.drm_di_minor = 4; ++ sv.drm_dd_major = -1; /* Don't care */ ++ sv.drm_dd_minor = -1; /* Don't care */ ++ if (drmSetInterfaceVersion(fd, &sv)) { + #ifndef __alpha__ +- pci_domain_ok = 0; ++ pci_domain_ok = 0; + #endif +- sv.drm_di_major = 1; +- sv.drm_di_minor = 1; +- sv.drm_dd_major = -1; /* Don't care */ +- sv.drm_dd_minor = -1; /* Don't care */ +- drmMsg("drmOpenByBusid: Interface 1.4 failed, trying 1.1\n"); +- drmSetInterfaceVersion(fd, &sv); +- } +- buf = drmGetBusid(fd); +- drmMsg("drmOpenByBusid: drmGetBusid reports %s\n", buf); +- if (buf && drmMatchBusID(buf, busid, pci_domain_ok)) { +- drmFreeBusid(buf); +- return fd; ++ sv.drm_di_major = 1; ++ sv.drm_di_minor = 1; ++ sv.drm_dd_major = -1; /* Don't care */ ++ sv.drm_dd_minor = -1; /* Don't care */ ++ drmMsg("drmOpenByBusid: Interface 1.4 failed, trying 1.1\n"); ++ drmSetInterfaceVersion(fd, &sv); ++ } ++ buf = drmGetBusid(fd); ++ if (buf) { ++ drmMsg("drmOpenByBusid: drmGetBusid reports %s\n", buf); ++ if (drmMatchBusID(buf, busid, pci_domain_ok)) { ++ drmFreeBusid(buf); ++ return fd; ++ } ++ drmFreeBusid(buf); ++ } ++ close(fd); + } +- if (buf) +- drmFreeBusid(buf); +- close(fd); +- } + } + return -1; + }
Signature · 1 line
2.29.2
PATCH 2/3 package/intel-mediadriver: drop unrecognized options
BUILD_ALONG_WITH_CMRTLIB has been dropped since version 18.2.0 and
https://github.com/intel/media-driver/commit/c3e13c175d12790ab70c4de3521e47f62be780de
RUN_TEST_SUITE is also unrecognized (only MEDIA_RUN_TEST_SUITE is recognized)
--- package/intel-mediadriver/intel-mediadriver.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
package/intel-mediadriver/intel-mediadriver.mk +1 -3
@@ -22,9 +22,7 @@ INTEL_MEDIADRIVER_DEPENDENCIES = \ INTEL_MEDIADRIVER_SUPPORTS_IN_SOURCE_BUILD = NO INTEL_MEDIADRIVER_CONF_OPTS = \ - -DBUILD_ALONG_WITH_CMRTLIB=1 \ -DINSTALL_DRIVERS_SYSCONF=OFF \ - -DMEDIA_RUN_TEST_SUITE=OFF \ - -DRUN_TEST_SUITE=OFF + -DMEDIA_RUN_TEST_SUITE=OFF $(eval $(cmake-package))
Signature · 1 line
2.29.2
PATCH 2/3 package/intel-mediadriver: drop unrecognized options
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
BUILD_ALONG_WITH_CMRTLIBhas been dropped since version 18.2.0 and
https://github.com/intel/media-driver/commit/c3e13c175d12790ab70c4de3521e47f62be780de
RUN_TEST_SUITEis also unrecognized (onlyMEDIA_RUN_TEST_SUITEis recognized)Signed-off-by Fabrice Fontaine <[email protected]>
Committed to 2020.02.x and 2020.11.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 3/3 package/intel-mediadriver: fix option
In reply to Fabrice FontaineReplace INSTALL_DRIVERS_SYSCONF by INSTALL_DRIVER_SYSCONF which is the correct name since version 18.2.0 and
https://github.com/intel/media-driver/commit/81796c8a9e44b878e26064c898e0f4730e8220cf
--- package/intel-mediadriver/intel-mediadriver.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/intel-mediadriver/intel-mediadriver.mk +1 -1
@@ -22,7 +22,7 @@ INTEL_MEDIADRIVER_DEPENDENCIES = \ INTEL_MEDIADRIVER_SUPPORTS_IN_SOURCE_BUILD = NO INTEL_MEDIADRIVER_CONF_OPTS = \ - -DINSTALL_DRIVERS_SYSCONF=OFF \ + -DINSTALL_DRIVER_SYSCONF=OFF \ -DMEDIA_RUN_TEST_SUITE=OFF $(eval $(cmake-package))
Signature · 1 line
2.29.2
PATCH 3/3 package/intel-mediadriver: fix option
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
Replace
INSTALL_DRIVERS_SYSCONFbyINSTALL_DRIVER_SYSCONFwhich is the correct name since version 18.2.0 and
https://github.com/intel/media-driver/commit/81796c8a9e44b878e26064c898e0f4730e8220cfSigned-off-by Fabrice Fontaine <[email protected]>
Committed to 2020.02.x and 2020.11.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/3 package/intel-mediadriver: fix build with gcc 10
In reply to Fabrice FontaineQuoted 8 lines · On Sun, 31 Jan 2021 14:31:58 +0100 Fabrice Fontaine…
Fixes:
- http://autobuild.buildroot.org/results/d5ab36026a66a4f371fb6ef6c9ecf43e9617d119Signed-off-by Fabrice Fontaine <[email protected]>--- ...-Werror=format-overflow-under-gcc-10.patch | 162 ++++++++++++++++++ 1 file changed, 162 insertions(+) create mode 100644 package/intel-mediadriver/0002-build-fix-Werror=format-overflow-under-gcc-10.patch
Series applied. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/3 package/intel-mediadriver: fix build with gcc 10
In reply to Fabrice FontaineQuoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
Fixes:
- http://autobuild.buildroot.org/results/d5ab36026a66a4f371fb6ef6c9ecf43e9617d119Signed-off-by Fabrice Fontaine <[email protected]>
Committed to 2020.11.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard