mirror of
https://git.yoctoproject.org/poky
synced 2026-04-07 23:02:22 +02:00
igt-gpu-tools: upgrade 1.25 -> 1.26
Drop patches merged upstream. (From OE-Core rev: 8f97315e2fbec7308b77d5b53077014bbd973c53) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
eb2327bc7d
commit
83bb5e110d
@@ -1,42 +0,0 @@
|
||||
From 606349860d27492c328752dca5a3784c0e9a6d24 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
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 <raj.khem@gmail.com>
|
||||
---
|
||||
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
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
meson: Allow source location to be configurable
|
||||
|
||||
Hardcoding a build source path into a binary when cross compiling isn't
|
||||
appropriate and breaks build reproducibility. Allow the srcdir to be
|
||||
specified by an optional configuration option to meson.
|
||||
|
||||
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
|
||||
Upstream-Status: Submitted [https://lists.freedesktop.org/archives/igt-dev/2021-February/029443.html]
|
||||
|
||||
Index: git/lib/meson.build
|
||||
===================================================================
|
||||
--- git.orig/lib/meson.build
|
||||
+++ git/lib/meson.build
|
||||
@@ -122,7 +122,11 @@ if chamelium.found()
|
||||
lib_sources += 'igt_chamelium_stream.c'
|
||||
endif
|
||||
|
||||
-srcdir = join_paths(meson.source_root(), 'tests')
|
||||
+if get_option('srcdir') != ''
|
||||
+ srcdir = join_paths(get_option('srcdir'), 'tests')
|
||||
+else
|
||||
+ srcdir = join_paths(meson.source_root(), 'tests')
|
||||
+endif
|
||||
|
||||
lib_version = vcs_tag(input : 'version.h.in', output : 'version.h',
|
||||
fallback : 'NO-GIT',
|
||||
Index: git/meson_options.txt
|
||||
===================================================================
|
||||
--- git.orig/meson_options.txt
|
||||
+++ git/meson_options.txt
|
||||
@@ -50,3 +50,7 @@ option('use_rpath',
|
||||
type : 'boolean',
|
||||
value : false,
|
||||
description : 'Set runpath on installed executables for libigt.so')
|
||||
+
|
||||
+option('srcdir',
|
||||
+ type : 'string',
|
||||
+ description : 'Path to source code to be compiled into binaries (optional)')
|
||||
@@ -9,12 +9,10 @@ LICENSE = "MIT"
|
||||
|
||||
inherit meson
|
||||
|
||||
SRCREV = "d16ad07e7f2a028e14d61f570931c87fa5ce404c"
|
||||
PV = "1.25+git${SRCPV}"
|
||||
SRCREV = "203def046b466fb2da67f9f15552d84e1c0b41f2"
|
||||
PV = "1.26"
|
||||
|
||||
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"
|
||||
SRC_URI = "git://gitlab.freedesktop.org/drm/igt-gpu-tools.git;protocol=https"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user