From 193236933b0f4ab91b1625b64e2187e2db4e0e8f Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 5 Apr 2019 15:28:33 -0400 Subject: reset upstream subtrees to HEAD Reset the following subtrees on HEAD: poky: 8217b477a1(master) meta-xilinx: 64aa3d35ae(master) meta-openembedded: 0435c9e193(master) meta-raspberrypi: 490a4441ac(master) meta-security: cb6d1c85ee(master) Squashed patches: meta-phosphor: drop systemd 239 patches meta-phosphor: mrw-api: use correct install path Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d Signed-off-by: Brad Bishop --- .../0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch | 116 --------------------- .../xf86-video-intel/01_Fix-build-on-i686.patch | 55 ++++++++++ .../xorg-driver/xf86-video-intel/glibc.patch | 25 ----- 3 files changed, 55 insertions(+), 141 deletions(-) delete mode 100644 poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch create mode 100644 poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/01_Fix-build-on-i686.patch delete mode 100644 poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/glibc.patch (limited to 'poky/meta/recipes-graphics/xorg-driver/xf86-video-intel') diff --git a/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch b/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch deleted file mode 100644 index 06ef10501..000000000 --- a/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 96d4e8e7b8a699f0ef77fa7b210d4de5f1c703d0 Mon Sep 17 00:00:00 2001 -From: Liwei Song -Date: Wed, 22 Nov 2017 08:59:03 +0000 -Subject: [PATCH] Add Coffeelake PCI IDs for S Skus - -Add the Coffeelake PCI IDs based on the following kernel patches: - -commit b056f8f3d6b900e8afd19f312719160346d263b4 -Author: Anusha Srivatsa -Date: Thu Jun 8 16:41:05 2017 -0700 - - drm/i915/cfl: Add Coffee Lake PCI IDs for S Skus. - -Upstream-Status: Submitted [https://patchwork.kernel.org/patch/10139905] - -Signed-off-by: Liwei Song ---- - src/i915_pciids.h | 7 +++++++ - src/intel_module.c | 13 +++++++++++++ - src/sna/gen9_render.c | 12 ++++++++++++ - 3 files changed, 32 insertions(+) - -diff --git a/src/i915_pciids.h b/src/i915_pciids.h -index 0370f830c541..11ccfa9c047a 100644 ---- a/src/i915_pciids.h -+++ b/src/i915_pciids.h -@@ -340,4 +340,11 @@ - INTEL_VGA_DEVICE(0x3184, info), \ - INTEL_VGA_DEVICE(0x3185, info) - -+#define INTEL_CFL_S_IDS(info) \ -+ INTEL_VGA_DEVICE(0x3E90, info), /* SRV GT1 */ \ -+ INTEL_VGA_DEVICE(0x3E93, info), /* SRV GT1 */ \ -+ INTEL_VGA_DEVICE(0x3E91, info), /* SRV GT2 */ \ -+ INTEL_VGA_DEVICE(0x3E92, info), /* SRV GT2 */ \ -+ INTEL_VGA_DEVICE(0x3E96, info) /* SRV GT2 */ -+ - #endif /* _I915_PCIIDS_H */ -diff --git a/src/intel_module.c b/src/intel_module.c -index 6b04857e2853..4827a67255f0 100644 ---- a/src/intel_module.c -+++ b/src/intel_module.c -@@ -138,6 +138,10 @@ static const struct intel_device_info intel_geminilake_info = { - .gen = 0113, - }; - -+static const struct intel_device_info intel_coffeelake_info = { -+ .gen = 0114, -+}; -+ - static const SymTabRec intel_chipsets[] = { - {PCI_CHIP_I810, "i810"}, - {PCI_CHIP_I810_DC100, "i810-dc100"}, -@@ -303,6 +307,13 @@ static const SymTabRec intel_chipsets[] = { - {0x5916, "HD Graphics 620"}, - {0x591E, "HD Graphics 615"}, - -+ /*Coffeelake*/ -+ {0x3E90, "HD Graphics"}, -+ {0x3E93, "HD Graphics"}, -+ {0x3E91, "HD Graphics"}, -+ {0x3E92, "HD Graphics"}, -+ {0x3E96, "HD Graphics"}, -+ - /* When adding new identifiers, also update: - * 1. intel_identify() - * 2. man/intel.man -@@ -368,6 +379,8 @@ static const struct pci_id_match intel_device_match[] = { - - INTEL_GLK_IDS(&intel_geminilake_info), - -+ INTEL_CFL_S_IDS(&intel_coffeelake_info), -+ - INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info), - #endif - -diff --git a/src/sna/gen9_render.c b/src/sna/gen9_render.c -index e5f12c723956..7f49052c5ec1 100644 ---- a/src/sna/gen9_render.c -+++ b/src/sna/gen9_render.c -@@ -245,6 +245,11 @@ static const struct gt_info glk_gt_info = { - .urb = { .max_vs_entries = 320 }, - }; - -+static const struct gt_info cfl_gt_info = { -+ .name = "Coffeelake (gen9)", -+ .urb = { .max_vs_entries = 960 }, -+}; -+ - static bool is_skl(struct sna *sna) - { - return sna->kgem.gen == 0110; -@@ -265,6 +270,11 @@ static bool is_glk(struct sna *sna) - return sna->kgem.gen == 0113; - } - -+static bool is_cfl(struct sna *sna) -+{ -+ return sna->kgem.gen == 0114; -+} -+ - - static inline bool too_large(int width, int height) - { -@@ -4040,6 +4050,8 @@ static bool gen9_render_setup(struct sna *sna) - state->info = &kbl_gt_info; - if (is_glk(sna)) - state->info = &glk_gt_info; -+ if (is_cfl(sna)) -+ state->info = &cfl_gt_info; - - sna_static_stream_init(&general); - --- -2.13.3 - diff --git a/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/01_Fix-build-on-i686.patch b/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/01_Fix-build-on-i686.patch new file mode 100644 index 000000000..52916f8b4 --- /dev/null +++ b/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/01_Fix-build-on-i686.patch @@ -0,0 +1,55 @@ +From a414d4e24461da1cb4cef8ee910bc57bab360ceb Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Tue, 6 Mar 2018 12:07:46 -0500 +Subject: [PATCH] Fix build on i686 + +Presumably this only matters for i686 because amd64 implies sse2, but: + +BUILDSTDERR: In file included from gen4_vertex.c:34: +BUILDSTDERR: gen4_vertex.c: In function 'emit_vertex': +BUILDSTDERR: sna_render_inline.h:40:26: error: inlining failed in call to always_inline 'vertex_emit_2s': target specific option mismatch +BUILDSTDERR: static force_inline void vertex_emit_2s(struct sna *sna, int16_t x, int16_t y) +BUILDSTDERR: ^~~~~~~~~~~~~~ +BUILDSTDERR: gen4_vertex.c:308:25: note: called from here +BUILDSTDERR: #define OUT_VERTEX(x,y) vertex_emit_2s(sna, x,y) /* XXX assert(!too_large(x, y)); */ +BUILDSTDERR: ^~~~~~~~~~~~~~~~~~~~~~~~ +BUILDSTDERR: gen4_vertex.c:360:2: note: in expansion of macro 'OUT_VERTEX' +BUILDSTDERR: OUT_VERTEX(dstX, dstY); +BUILDSTDERR: ^~~~~~~~~~ + +The bug here appears to be that emit_vertex() is declared 'sse2' but +vertex_emit_2s is merely always_inline. gcc8 decides that since you said +always_inline you need to have explicitly cloned it for every +permutation of targets. Merely saying inline seems to do the job of +cloning vertex_emit_2s as much as necessary. + +So to reiterate: if you say always-inline, it won't, but if you just say +maybe inline, it will. Thanks gcc, that's helpful. + +- ajax + +Patch taken from Fedora. + +Upstream-Status: Pending +Signed-off-by: Anuj Mittal + +--- + src/sna/compiler.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/sna/compiler.h b/src/sna/compiler.h +index 3c176a16..bc447c7a 100644 +--- a/src/sna/compiler.h ++++ b/src/sna/compiler.h +@@ -32,7 +32,7 @@ + #define likely(expr) (__builtin_expect (!!(expr), 1)) + #define unlikely(expr) (__builtin_expect (!!(expr), 0)) + #define noinline __attribute__((noinline)) +-#define force_inline inline __attribute__((always_inline)) ++#define force_inline inline + #define fastcall __attribute__((regparm(3))) + #define must_check __attribute__((warn_unused_result)) + #define constant __attribute__((const)) +-- +2.16.2 + diff --git a/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/glibc.patch b/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/glibc.patch deleted file mode 100644 index ada9eb5e5..000000000 --- a/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/glibc.patch +++ /dev/null @@ -1,25 +0,0 @@ -Add a missing include needed for glibc 2.28 to avoid: - -| ../../git/tools/backlight_helper.c: In function 'main': -| ../../git/tools/backlight_helper.c:54:34: error: implicit declaration of function 'major' [-Werror=implicit-function-declaration] -| if (fd < 0 || fstat(fd, &st) || major(st.st_dev)) -| ^~~~~ -| ../../git/tools/backlight_helper.c:54:34: warning: nested extern declaration of 'major' [-Wnested-externs] -| cc1: some warnings being treated as errors -| Makefile:666: recipe for target 'backlight_helper.o' failed - -Upstream-Status: Pending -RP 2018/8/12 - -Index: git/tools/backlight_helper.c -=================================================================== ---- git.orig/tools/backlight_helper.c -+++ git/tools/backlight_helper.c -@@ -8,6 +8,7 @@ - - #include - #include -+#include - - #if MAJOR_IN_MKDEV - #include -- cgit v1.2.3