From 5537ad961e5d0663c2d293abe8312bd2b614d9ff Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 27 Feb 2021 14:14:12 -0800 Subject: igt-gpu-tools: Fix warnings with gcc 11 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...ib-igt_edid-Allocate-raw-8-bytes-for-VSDB.patch | 42 ++++++++++++++++++++++ .../igt-gpu-tools/igt-gpu-tools_git.bb | 1 + 2 files changed, 43 insertions(+) create mode 100644 meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-igt_edid-Allocate-raw-8-bytes-for-VSDB.patch (limited to 'meta') diff --git a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-igt_edid-Allocate-raw-8-bytes-for-VSDB.patch b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-igt_edid-Allocate-raw-8-bytes-for-VSDB.patch new file mode 100644 index 0000000000..38bd4550a3 --- /dev/null +++ b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-igt_edid-Allocate-raw-8-bytes-for-VSDB.patch @@ -0,0 +1,42 @@ +From 606349860d27492c328752dca5a3784c0e9a6d24 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 27 Feb 2021 11:05:45 -0800 +Subject: [PATCH i-g-t] lib/igt_edid: Allocate raw 8-bytes for VSDB + +hdmi_vsdb is an element of cea_vsdb which makes the size of cea_vsdb to +be 8 ( 3bytes ieee_oui ) + ( 5bytes hdmi_vsdb struct), its true that we +only use 7 bytes technically we can only allocate 7byte array but since +we are writing to elements of hdmi_vsdb struct which is sitting at offet +4-8 in cea_vsdb, compiler thinks we have an element which is out of +array bounds since out allocated size is 7bytes + +This errors out +../git/lib/igt_edid.c:365:13: error: array subscript 'struct hdmi_vsdb[0]' is partly outside array bounds of 'char[7]' [-Werror=array-bounds] + 365 | hdmi->src_phy_addr[0] = 0x10; + | ^~ + +allocating one extra byte matches with size of cea_vsdb and compiler is +happy + +Upstream-Status: Submitted [https://lists.freedesktop.org/archives/igt-dev/2021-February/029446.html] +Signed-off-by: Khem Raj +--- + lib/igt_edid.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/igt_edid.c b/lib/igt_edid.c +index 1c85486d..ce09cc47 100644 +--- a/lib/igt_edid.c ++++ b/lib/igt_edid.c +@@ -351,7 +351,7 @@ void cea_sad_init_pcm(struct cea_sad *sad, int channels, + const struct cea_vsdb *cea_vsdb_get_hdmi_default(size_t *size) + { + /* We'll generate a VSDB with 2 extension fields. */ +- static char raw[CEA_VSDB_HDMI_MIN_SIZE + 2] = {0}; ++ static char raw[CEA_VSDB_HDMI_MIN_SIZE + 3] = {0}; + struct cea_vsdb *vsdb; + struct hdmi_vsdb *hdmi; + +-- +2.30.1 + diff --git a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb index f25cbc0603..098594cf2c 100644 --- a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb +++ b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb @@ -11,6 +11,7 @@ SRCREV = "d16ad07e7f2a028e14d61f570931c87fa5ce404c" PV = "1.25+git${SRCPV}" SRC_URI = "git://gitlab.freedesktop.org/drm/igt-gpu-tools.git;protocol=https \ + file://0001-lib-igt_edid-Allocate-raw-8-bytes-for-VSDB.patch \ file://reproducibility.patch" S = "${WORKDIR}/git" -- cgit 1.2.3-korg