diff --git a/.gitignore b/.gitignore index e0aaf1d..7b41191 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ SOURCES/intel-gpu-tools-1.9.tar.bz2 -SOURCES/xf86-video-intel-20180618.tar.bz2 +SOURCES/xf86-video-intel-20200205.tar.bz2 diff --git a/.xorg-x11-drv-intel.metadata b/.xorg-x11-drv-intel.metadata index 5f90364..2f622da 100644 --- a/.xorg-x11-drv-intel.metadata +++ b/.xorg-x11-drv-intel.metadata @@ -1,2 +1,2 @@ 396e9f50283681d50364b86a7af9988c56148ac8 SOURCES/intel-gpu-tools-1.9.tar.bz2 -7e044e8985f88104f40cc9a96bce001edff8a184 SOURCES/xf86-video-intel-20180618.tar.bz2 +ed7bf3dafa74f63f48c7d69779d6747faf94d602 SOURCES/xf86-video-intel-20200205.tar.bz2 diff --git a/SOURCES/0001-Fix-build-on-F28-and-later.patch b/SOURCES/0001-Fix-build-on-F28-and-later.patch deleted file mode 100644 index ca525ec..0000000 --- a/SOURCES/0001-Fix-build-on-F28-and-later.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 9c1151b4d65c356f0d25d952fe1a10c89fdb834a Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Mon, 5 Mar 2018 11:03:18 -0500 -Subject: [PATCH] Fix build on F28 and later - -Newer gcc complains that it doesn't know how to always-inline memcpy(): - - /usr/include/bits/string_fortified.h:31:1: error: inlining failed in - call to always_inline 'memcpy': target specific option mismatch - -This is because we need to wrap our declaration of memcpy() in the -options we're trying to push at the top of blt.c. So: include compiler.h -to define sse2, then push options, then include everything else. - -However if you do that, the word 'nonnull' collides with the usage in -. I'm too lazy to fix that properly, just expand it to -the __attribute__ form in the few places we say it. - -Signed-off-by: Adam Jackson ---- - src/sna/blt.c | 6 ++++-- - src/sna/compiler.h | 2 -- - src/sna/gen6_common.h | 6 +++--- - 3 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/src/sna/blt.c b/src/sna/blt.c -index cb90437a..fb357d35 100644 ---- a/src/sna/blt.c -+++ b/src/sna/blt.c -@@ -29,13 +29,15 @@ - #include "config.h" - #endif - --#include "sna.h" --#include -+#include "compiler.h" - - #if defined(sse2) - #pragma GCC push_options - #pragma GCC target("sse2,inline-all-stringops,fpmath=sse") - #pragma GCC optimize("Ofast") -+ -+#include -+#include "sna.h" - #include - - #if __x86_64__ -diff --git a/src/sna/compiler.h b/src/sna/compiler.h -index 0f3775ec..3c176a16 100644 ---- a/src/sna/compiler.h -+++ b/src/sna/compiler.h -@@ -39,7 +39,6 @@ - #define pure __attribute__((pure)) - #define tightly_packed __attribute__((__packed__)) - #define flatten __attribute__((flatten)) --#define nonnull __attribute__((nonnull)) - #define page_aligned __attribute__((aligned(4096))) - #else - #define likely(expr) (expr) -@@ -52,7 +51,6 @@ - #define pure - #define tighly_packed - #define flatten --#define nonnull - #define page_aligned - #endif - -diff --git a/src/sna/gen6_common.h b/src/sna/gen6_common.h -index b53ec0c9..119a2d5d 100644 ---- a/src/sna/gen6_common.h -+++ b/src/sna/gen6_common.h -@@ -133,7 +133,7 @@ inline static bool force_blt_ring(struct sna *sna, struct kgem_bo *bo) - return false; - } - --nonnull inline static bool -+__attribute__((nonnull)) inline static bool - prefer_blt_ring(struct sna *sna, struct kgem_bo *bo, unsigned flags) - { - if (PREFER_RENDER) -@@ -148,7 +148,7 @@ prefer_blt_ring(struct sna *sna, struct kgem_bo *bo, unsigned flags) - return can_switch_to_blt(sna, bo, flags); - } - --nonnull inline static bool -+__attribute__((nonnull)) inline static bool - prefer_render_ring(struct sna *sna, struct kgem_bo *bo) - { - if (sna->kgem.ring == KGEM_RENDER) -@@ -191,7 +191,7 @@ prefer_blt_composite(struct sna *sna, struct sna_composite_op *tmp) - return prefer_blt_bo(sna, tmp->src.bo, tmp->dst.bo); - } - --nonnull static inline bool -+__attribute__((nonnull)) static inline bool - prefer_blt_fill(struct sna *sna, struct kgem_bo *bo, unsigned flags) - { - if (PREFER_RENDER) --- -2.16.2 - diff --git a/SOURCES/0001-Fix-build-on-i686.patch b/SOURCES/0001-Fix-build-on-i686.patch deleted file mode 100644 index 0851fbe..0000000 --- a/SOURCES/0001-Fix-build-on-i686.patch +++ /dev/null @@ -1,49 +0,0 @@ -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 ---- - 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/SPECS/xorg-x11-drv-intel.spec b/SPECS/xorg-x11-drv-intel.spec index c60ea6e..3ea9fbf 100644 --- a/SPECS/xorg-x11-drv-intel.spec +++ b/SPECS/xorg-x11-drv-intel.spec @@ -1,7 +1,7 @@ %define moduledir %(pkg-config xorg-server --variable=moduledir ) %define driverdir %{moduledir}/drivers %define gputoolsver 1.9 -%define gitdate 20180618 +%define gitdate 20200205 %define gitrev .%{gitdate} %undefine _hardened_build @@ -9,7 +9,7 @@ Summary: Xorg X11 Intel video driver Name: xorg-x11-drv-intel Version: 2.99.917 -Release: 38%{?gitrev}%{?dist} +Release: 39%{?gitrev}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -27,8 +27,8 @@ Patch0: intel-gcc-pr65873.patch Patch1: igt-stat.patch # https://bugs.freedesktop.org/show_bug.cgi?id=96255#c11 Patch4: 0001-sna-Avoid-clobbering-output-physical-size-with-xf86O.patch -Patch5: 0001-Fix-build-on-F28-and-later.patch -Patch6: 0001-Fix-build-on-i686.patch +#Patch5: 0001-Fix-build-on-F28-and-later.patch +#Patch6: 0001-Fix-build-on-i686.patch ExclusiveArch: %{ix86} x86_64 ia64 @@ -91,8 +91,8 @@ Debugging tools for Intel graphics chips %setup -q -n xf86-video-intel-%{?gitdate:%{gitdate}}%{!?gitdate:%{dirsuffix}} -b3 %patch0 -p1 -b .gcc %patch4 -p1 -%patch5 -p1 -%patch6 -p1 +#patch5 -p1 +#patch6 -p1 pushd ../intel-gpu-tools-%{gputoolsver} %patch1 -p1 -b .stat @@ -156,6 +156,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libI*XvMC.so %{_mandir}/man1/intel_*.1* %changelog +* Wed Jun 03 2020 Adam Jackson - 2.99.917-39.20200205 +- Sync the driver snapshot with Fedora 32 + * Fri Jun 29 2018 Adam Jackson - 2.99.917-38.20180618 - Use ldconfig scriptlet macros