diff --git a/.gitignore b/.gitignore index 68f572c..19d380f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/intel-gpu-tools-20130611.tar.bz2 -SOURCES/xf86-video-intel-2.99.916.tar.bz2 +SOURCES/intel-gpu-tools-1.9.tar.bz2 +SOURCES/xf86-video-intel-20150615.tar.bz2 diff --git a/.xorg-x11-drv-intel.metadata b/.xorg-x11-drv-intel.metadata index baa1ab9..bc921ff 100644 --- a/.xorg-x11-drv-intel.metadata +++ b/.xorg-x11-drv-intel.metadata @@ -1,2 +1,2 @@ -7f29a7c413357295e815a6495a2fcf219a0ada3b SOURCES/intel-gpu-tools-20130611.tar.bz2 -ad5fee90ceaed8daf36aecb1d5e68aeb5e0a070a SOURCES/xf86-video-intel-2.99.916.tar.bz2 +396e9f50283681d50364b86a7af9988c56148ac8 SOURCES/intel-gpu-tools-1.9.tar.bz2 +d10a548e95276136a7a2375a3dfd3eaae9e3178e SOURCES/xf86-video-intel-20150615.tar.bz2 diff --git a/SOURCES/0001-sna-Fix-use-of-GETBLOB-ioctl-for-grabbing-the-MST-pa.patch b/SOURCES/0001-sna-Fix-use-of-GETBLOB-ioctl-for-grabbing-the-MST-pa.patch deleted file mode 100644 index d871776..0000000 --- a/SOURCES/0001-sna-Fix-use-of-GETBLOB-ioctl-for-grabbing-the-MST-pa.patch +++ /dev/null @@ -1,68 +0,0 @@ -From f39e1d19c166a97a74974edf3fe79082d3a46d2b Mon Sep 17 00:00:00 2001 -From: Chris Wilson -Date: Wed, 10 Sep 2014 07:04:55 +0100 -Subject: [PATCH] sna: Fix use of GETBLOB ioctl for grabbing the MST path - -Unlike the other drm getters, GETBLOB insists on the exact length rather -than being told the buffer size. - -Reported-by: Dave Airlie -Signed-off-by: Chris Wilson ---- - src/sna/sna_display.c | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c -index a14f789..6e80d1b 100644 ---- a/src/sna/sna_display.c -+++ b/src/sna/sna_display.c -@@ -3492,7 +3492,7 @@ static int name_from_path(struct sna *sna, - char *name) - { - struct drm_mode_get_blob blob; -- char buf[32], *path = buf; -+ char *path; - int id; - - id = find_property(sna, sna_output, "PATH"); -@@ -3502,20 +3502,19 @@ static int name_from_path(struct sna *sna, - - VG_CLEAR(blob); - blob.blob_id = sna_output->prop_values[id]; -- blob.length = sizeof(buf)-1; -- blob.data = (uintptr_t)path; -- VG(memset(path, 0, blob.length)); -+ blob.length = 0; - if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETPROPBLOB, &blob)) - return 0; - -- if (blob.length >= sizeof(buf)) { -- path = alloca(blob.length + 1); -+ do { -+ id = blob.length; -+ path = alloca(id + 1); - blob.data = (uintptr_t)path; -- VG(memset(path, 0, blob.length)); -- DBG(("%s: reading %d bytes for path blob\n", __FUNCTION__, blob.length)); -+ VG(memset(path, 0, id)); -+ DBG(("%s: reading %d bytes for path blob\n", __FUNCTION__, id)); - if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETPROPBLOB, &blob)) - return 0; -- } -+ } while (id != blob.length); - - path[blob.length] = '\0'; /* paranoia */ - DBG(("%s: PATH='%s'\n", __FUNCTION__, path)); -@@ -3540,7 +3539,8 @@ static int name_from_path(struct sna *sna, - - for (n = 0; n < sna->mode.num_real_output; n++) { - if (to_sna_output(config->output[n])->id == id) -- return snprintf(name, 32, "%s-%s", config->output[n]->name, c + 1); -+ return snprintf(name, 32, "%s-%s", -+ config->output[n]->name, c + 1); - } - } - --- -1.8.3.1 - diff --git a/SOURCES/0001-sna-gen8-Clamp-URB-allocations-for-GT3.patch b/SOURCES/0001-sna-gen8-Clamp-URB-allocations-for-GT3.patch deleted file mode 100644 index 4632fb4..0000000 --- a/SOURCES/0001-sna-gen8-Clamp-URB-allocations-for-GT3.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 7a9bdadd71730adc5266bc6758982abec5917b93 Mon Sep 17 00:00:00 2001 -From: Chris Wilson -Date: Wed, 22 Oct 2014 19:31:10 +0100 -Subject: [PATCH] sna/gen8: Clamp URB allocations for GT3 - -GT3 requires some reserved space in the URB allocation and so we must -reduce the amount we allocate to our vertices. - -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=81583 -Signed-off-by: Chris Wilson ---- - src/sna/gen8_render.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/sna/gen8_render.c b/src/sna/gen8_render.c -index 1eac5a7..a6a5dd2 100644 ---- a/src/sna/gen8_render.c -+++ b/src/sna/gen8_render.c -@@ -462,21 +462,21 @@ gen8_emit_urb(struct sna *sna) - { - /* num of VS entries must be divisible by 8 if size < 9 */ - OUT_BATCH(GEN8_3DSTATE_URB_VS | (2 - 2)); -- OUT_BATCH(1024 << URB_ENTRY_NUMBER_SHIFT | -+ OUT_BATCH(960 << URB_ENTRY_NUMBER_SHIFT | - (2 - 1) << URB_ENTRY_SIZE_SHIFT | -- 0 << URB_STARTING_ADDRESS_SHIFT); -+ 4 << URB_STARTING_ADDRESS_SHIFT); - - OUT_BATCH(GEN8_3DSTATE_URB_HS | (2 - 2)); - OUT_BATCH(0 << URB_ENTRY_SIZE_SHIFT | -- 0 << URB_STARTING_ADDRESS_SHIFT); -+ 4 << URB_STARTING_ADDRESS_SHIFT); - - OUT_BATCH(GEN8_3DSTATE_URB_DS | (2 - 2)); - OUT_BATCH(0 << URB_ENTRY_SIZE_SHIFT | -- 0 << URB_STARTING_ADDRESS_SHIFT); -+ 4 << URB_STARTING_ADDRESS_SHIFT); - - OUT_BATCH(GEN8_3DSTATE_URB_GS | (2 - 2)); - OUT_BATCH(0 << URB_ENTRY_SIZE_SHIFT | -- 0 << URB_STARTING_ADDRESS_SHIFT); -+ 4 << URB_STARTING_ADDRESS_SHIFT); - } - - static void --- -2.1.0 - diff --git a/SOURCES/intel-2.99.916-no-present.patch b/SOURCES/intel-2.99.916-no-present.patch deleted file mode 100644 index ce8e041..0000000 --- a/SOURCES/intel-2.99.916-no-present.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up xf86-video-intel-2.99.916/src/sna/sna_driver.c.jx xf86-video-intel-2.99.916/src/sna/sna_driver.c ---- xf86-video-intel-2.99.916/src/sna/sna_driver.c.jx 2014-08-29 05:33:11.000000000 -0400 -+++ xf86-video-intel-2.99.916/src/sna/sna_driver.c 2015-01-06 14:19:23.490615519 -0500 -@@ -715,7 +715,6 @@ static Bool sna_pre_init(ScrnInfoPtr scr - sna->present.available = false; - if (xf86ReturnOptValBool(sna->Options, OPTION_PRESENT, TRUE)) { - #if HAVE_PRESENT -- sna->present.available = !!xf86LoadSubModule(scrn, "present"); - #endif - } - diff --git a/SOURCES/intel-fix-xorg-triplebuf.patch b/SOURCES/intel-fix-xorg-triplebuf.patch deleted file mode 100644 index 5ac5ac2..0000000 --- a/SOURCES/intel-fix-xorg-triplebuf.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up xf86-video-intel-2.99.916/src/sna/sna_dri2.c.dma xf86-video-intel-2.99.916/src/sna/sna_dri2.c ---- xf86-video-intel-2.99.916/src/sna/sna_dri2.c.dma 2014-10-03 01:00:55.438371801 +0000 -+++ xf86-video-intel-2.99.916/src/sna/sna_dri2.c 2014-10-03 01:01:58.112724027 +0000 -@@ -254,19 +254,7 @@ inline static void *dri2_window_get_fron - - #else - --#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,15,99,904,0) --/* Prime fixed for triple buffer support */ - #define xorg_can_triple_buffer(ptr) 1 --#elif XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,12,99,901,0) --/* Before numGPUScreens was introduced */ --#define xorg_can_triple_buffer(ptr) 1 --#else --/* Subject to crashers when combining triple buffering and Prime */ --inline static bool xorg_can_triple_buffer(struct sna *sna) --{ -- return screenInfo.numGPUScreens == 0; --} --#endif - - static Bool - sna_dri2_swap_limit_validate(DrawablePtr draw, int swap_limit) diff --git a/SPECS/xorg-x11-drv-intel.spec b/SPECS/xorg-x11-drv-intel.spec index 5cb4a40..4bcce21 100644 --- a/SPECS/xorg-x11-drv-intel.spec +++ b/SPECS/xorg-x11-drv-intel.spec @@ -1,8 +1,8 @@ %define moduledir %(pkg-config xorg-server --variable=moduledir ) %define driverdir %{moduledir}/drivers -%define gputoolsdate 20130611 -#define gitdate 20120907 -#define gitrev .%{gitdate} +%define gputoolsver 1.9 +%define gitdate 20150615 +%define gitrev .%{gitdate} %if 0%{?rhel} == 7 %define rhel7 1 @@ -17,12 +17,16 @@ %if 0%{?rhel7} || 0%{?fedora} > 20 %define kmsonly 1 +%else +%ifnarch %{ix86} +%define kmsonly 1 +%endif %endif Summary: Xorg X11 Intel video driver Name: xorg-x11-drv-intel -Version: 2.99.916 -Release: 5%{?gitrev}%{?dist} +Version: 2.99.917 +Release: 8%{?gitrev}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -33,24 +37,26 @@ Source0: xf86-video-intel-%{gitdate}.tar.bz2 Source0: http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2 %endif Source1: make-intel-gpu-tools-snapshot.sh -Source3: intel-gpu-tools-%{gputoolsdate}.tar.bz2 +Source3: http://xorg.freedesktop.org/archive/individual/app/intel-gpu-tools-%{gputoolsver}.tar.bz2 Source4: make-git-snapshot.sh -Patch0: 0001-sna-Fix-use-of-GETBLOB-ioctl-for-grabbing-the-MST-pa.patch - -# patch for 1148691 dri2/prime interaction -Patch1: intel-fix-xorg-triplebuf.patch - -Patch2: intel-2.99.916-no-present.patch - -Patch3: 0001-sna-gen8-Clamp-URB-allocations-for-GT3.patch ExclusiveArch: %{ix86} x86_64 ia64 BuildRequires: autoconf automake libtool BuildRequires: flex bison BuildRequires: xorg-x11-server-devel >= 1.10.99.902 +BuildRequires: libX11-devel +BuildRequires: libXcursor-devel +BuildRequires: libXdamage-devel +BuildRequires: libXext-devel +BuildRequires: libXfixes-devel +BuildRequires: libXinerama-devel +BuildRequires: libXrandr-devel +BuildRequires: libXrender-devel +BuildRequires: libXtst-devel BuildRequires: libXvMC-devel +BuildRequires: libxshmfence-devel BuildRequires: mesa-libGL-devel >= 6.5-9 BuildRequires: libdrm-devel >= 2.4.25 BuildRequires: kernel-headers >= 2.6.32.3 @@ -58,15 +64,11 @@ BuildRequires: libudev-devel BuildRequires: libxcb-devel >= 1.5 BuildRequires: xcb-util-devel BuildRequires: cairo-devel +BuildRequires: python Requires: Xorg %(xserver-sdk-abi-requires ansic) Requires: Xorg %(xserver-sdk-abi-requires videodrv) -%if !0%{?rhel} -Requires: xserver-abi(xwayland) = 1 -%endif - -# el7.1 we need this for dri2 failures that cause crashes -Requires: xorg-x11-server-Xorg >= 1.15.0-29.el7 +Requires: polkit %description X.Org X11 Intel video driver. @@ -96,49 +98,31 @@ Debugging tools for Intel graphics chips %prep %setup -q -n xf86-video-intel-%{?gitdate:%{gitdate}}%{!?gitdate:%{dirsuffix}} -b3 -%patch0 -p1 -b .mstfix -%patch1 -p1 -b .fixc -%patch2 -p1 -b .present -%patch3 -p1 -b .gen8 - %build - -#export CFLAGS="$RPM_OPT_FLAGS -fno-omit-frame-pointer" -# we patched configure.ac -#%{?gitdate:autoreconf -v --install} -autoreconf -v --install - -%configure \ -%if !0%{?rhel7} -%ifnarch %{ix86} - --enable-kms-only \ -%endif -%endif - %{?kmsonly:--enable-kms-only} \ - --disable-static \ - --enable-dri \ - --disable-dri3 \ - --enable-xvmc \ - --enable-sna -make - -pushd ../intel-gpu-tools-%{gputoolsdate} +autoreconf -f -i -v +%configure %{?kmsonly:--enable-kms-only} --enable-tools +make %{?_smp_mflags} + +pushd ../intel-gpu-tools-%{gputoolsver} +# this is missing from the tarbal, having it empty is ok +touch lib/check-ndebug.h mkdir -p m4 autoreconf -f -i -v # --disable-dumper: quick_dump is both not recommended for packaging yet, # and requires python3 to build; i'd like to keep this spec valid for rhel6 # for at least a bit longer %configure %{!?prime:--disable-nouveau} --disable-dumper -make +# some of the sources are in utf-8 and pre-preprocessed by python +export LANG=en_US.UTF-8 +make %{?_smp_mflags} popd %install -rm -rf $RPM_BUILD_ROOT +%make_install +pushd ../intel-gpu-tools-%{gputoolsver} make install DESTDIR=$RPM_BUILD_ROOT - -pushd ../intel-gpu-tools-%{gputoolsdate} -make install DESTDIR=$RPM_BUILD_ROOT +rm -f $RPM_BUILD_ROOT%{_bindir}/eudb popd find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f -- @@ -146,56 +130,114 @@ find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f -- # libXvMC opens the versioned file name, these are useless rm -f $RPM_BUILD_ROOT%{_libdir}/libI*XvMC.so -%clean -rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%defattr(-,root,root,-) %doc COPYING %{_datadir}/polkit-1/actions/org.x.xf86-video-intel.backlight-helper.policy %{driverdir}/intel_drv.so -%ifarch %{ix86} -%if !0%{?rhel7}%{?kmsonly} +%if !%{?kmsonly} %{_libdir}/libI810XvMC.so.1* %endif -%endif %{_libdir}/libIntelXvMC.so.1* %{_libexecdir}/xf86-video-intel-backlight-helper +%{_datadir}/polkit-1/actions/org.x.xf86-video-intel.backlight-helper.policy %{_mandir}/man4/i* %files devel -%defattr(-,root,root,-) %{_bindir}/intel-gen4asm %{_bindir}/intel-gen4disasm %{_libdir}/pkgconfig/intel-gen4asm.pc %files -n intel-gpu-tools -%defattr(-,root,root,-) %doc COPYING -%{_bindir}/intel_* +%{_bindir}/gem_userptr_benchmark +%{_bindir}/intel* +%{_datadir}/gtk-doc %{_mandir}/man1/intel_*.1* %changelog -* Tue Jan 27 2015 Adam Jackson 2.99.916-5 -- Backport a gen8 stability fix +* Mon Jun 15 2015 Dave Airlie 2.99.917-8 +- update with newer snapshot - fixes some PRIME issues -* Tue Jan 06 2015 Adam Jackson 2.99.916-4 -- Disable present extension support more sternly +* Tue May 26 2015 Dave Airlie 2.99.917-7 +- update with newer snapshot - fix some problems, use upstream DRI default -* Tue Oct 07 2014 Dave Airlie 2.99.916-3 -- fix black screen with dri2/prime systems +* Thu Feb 26 2015 Hans de Goede - 2.99.917-6 +- Really really build intel-virtual-output (rhbz#1195962) -* Wed Sep 10 2014 Dave Airlie 2.99.916-2 -- fix bug with MST connector naming +* Thu Feb 26 2015 Hans de Goede - 2.99.917-5 +- Add more missing BuildRequires so that intel-virtual-output really gets + build (rhbz#1195962) + +* Thu Feb 26 2015 Hans de Goede - 2.99.917-4 +- Add missing BuildRequires libXext-devel so that intel-virtual-output gets + build (rhbz#1195962) + +* Wed Feb 11 2015 Hans de Goede - 2.99.917-3 +- Git snapshot of the day to bring in various DPMS and other fixes +- Update gpu-tools to 1.9 +- Xserver 1.17 ABI rebuild + +* Wed Dec 24 2014 Adel Gadllah 2.99.917-2 +- Enable DRI3 + +* Mon Dec 22 2014 Kevin Fenzi 2.99.917-1 +- Update to 2.99.917 + +* Mon Nov 17 2014 Adam Jackson 2.99.916-3 +- Today's git snapshot + +* Thu Sep 11 2014 Dave Airlie 2.99.916-2 +- backport some SNA and MST fixes. * Wed Sep 10 2014 Dave Airlie 2.99.916-1 -- intel 2.99.916 - adds mst support. +- Rebase to 2.99.916 + +* Wed Sep 03 2014 Dave Airlie 2.99.914-4 +- Add UXA MST support as a fallback + +* Tue Sep 02 2014 Adel Gadllah - 2.99.914-3 +- Backport fix for sna to fix broken shadow rendering in gtk + +* Mon Aug 18 2014 Fedora Release Engineering - 2.99.914-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Mon Jul 28 2014 Hans de Goede - 2.99.914-1 +- Rebase to 2.99.914 + +* Tue Jul 22 2014 Adel Gadllah - 2.99.912-6 +- Apply fix for sna render corruption due to missing fencing, FDO #81551 + +* Fri Jul 11 2014 Hans de Goede - 2.99.912-5 +- Fix a security issue in the backlight helper (CVE-2014-4910) + +* Tue Jul 1 2014 Hans de Goede - 2.99.912-4 +- Re-enable DRI3 support (the latest mesa fixes the gnome-shell hang) + +* Wed Jun 18 2014 Hans de Goede - 2.99.912-3 +- xserver 1.15.99.903 ABI rebuild + +* Thu Jun 12 2014 Hans de Goede - 2.99.912-2 +- DRI3 support causes gnome-shell to hang, disable for now + +* Wed Jun 11 2014 Hans de Goede - 2.99.912-1 +- Rebase to 2.99.912 +- Rebuild for xserver 1.15.99.903 +- Update intel-gpu-tools to 1.7 release + +* Sun Jun 08 2014 Fedora Release Engineering - 2.99.911-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon Apr 28 2014 Hans de Goede - 2.99.911-2 +- xserver 1.15.99-20140428 git snapshot ABI rebuild +- Add 2 patches from upstream to not close server-fds of udl devices -* Thu Aug 28 2014 Adam Jackson 2.99.914-1 -- intel 2.99.914 +* Thu Apr 17 2014 Hans de Goede - 2.99.911-1 +- Rebase to 2.99.911 +- Rebuild for xserver 1.15.99.902 * Mon Jan 13 2014 Adam Jackson - 2.21.15-13 - 1.15 ABI rebuild