From 16f1fa18f06e70f8ebc11d8f522512d79be7d1a8 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 10 2018 05:25:17 +0000 Subject: import libdrm-2.4.83-2.el7 --- diff --git a/.gitignore b/.gitignore index 8e65f74..68b8ec6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libdrm-2.4.74.tar.bz2 +SOURCES/libdrm-2.4.83.tar.bz2 diff --git a/.libdrm.metadata b/.libdrm.metadata index 9942d01..e4540ec 100644 --- a/.libdrm.metadata +++ b/.libdrm.metadata @@ -1 +1 @@ -0d9c02d5d2c6c2fac862cb687bf45bc20d129017 SOURCES/libdrm-2.4.74.tar.bz2 +f78d392684d6e482e8c0a85d355619ac64c4ad6a SOURCES/libdrm-2.4.83.tar.bz2 diff --git a/SOURCES/0001-intel-Change-a-KBL-pci-id-to-GT2-from-GT1.5.patch b/SOURCES/0001-intel-Change-a-KBL-pci-id-to-GT2-from-GT1.5.patch new file mode 100644 index 0000000..8ab8fa8 --- /dev/null +++ b/SOURCES/0001-intel-Change-a-KBL-pci-id-to-GT2-from-GT1.5.patch @@ -0,0 +1,48 @@ +From 7c71188610b4ceba0339c2bc884320bcb749adee Mon Sep 17 00:00:00 2001 +From: Anuj Phogat +Date: Wed, 20 Sep 2017 12:11:03 -0700 +Subject: [PATCH] intel: Change a KBL pci id to GT2 from GT1.5 + +See Mesa commit 9c588ff + +Cc: Matt Turner +Cc: Rodrigo Vivi +Signed-off-by: Anuj Phogat +Reviewed-by: Rodrigo Vivi +Signed-off-by: Rodrigo Vivi +--- + intel/intel_chipset.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/intel/intel_chipset.h b/intel/intel_chipset.h +index 3ff59ad..d81b164 100644 +--- a/intel/intel_chipset.h ++++ b/intel/intel_chipset.h +@@ -202,7 +202,7 @@ + #define PCI_CHIP_KABYLAKE_ULX_GT1 0x590E + #define PCI_CHIP_KABYLAKE_ULX_GT2 0x591E + #define PCI_CHIP_KABYLAKE_DT_GT2 0x5912 +-#define PCI_CHIP_KABYLAKE_DT_GT1_5 0x5917 ++#define PCI_CHIP_KABYLAKE_M_GT2 0x5917 + #define PCI_CHIP_KABYLAKE_DT_GT1 0x5902 + #define PCI_CHIP_KABYLAKE_HALO_GT2 0x591B + #define PCI_CHIP_KABYLAKE_HALO_GT4 0x593B +@@ -434,7 +434,6 @@ + + #define IS_KBL_GT1(devid) ((devid) == PCI_CHIP_KABYLAKE_ULT_GT1_5 || \ + (devid) == PCI_CHIP_KABYLAKE_ULX_GT1_5 || \ +- (devid) == PCI_CHIP_KABYLAKE_DT_GT1_5 || \ + (devid) == PCI_CHIP_KABYLAKE_ULT_GT1 || \ + (devid) == PCI_CHIP_KABYLAKE_ULX_GT1 || \ + (devid) == PCI_CHIP_KABYLAKE_DT_GT1 || \ +@@ -446,6 +445,7 @@ + (devid) == PCI_CHIP_KABYLAKE_ULT_GT2F || \ + (devid) == PCI_CHIP_KABYLAKE_ULX_GT2 || \ + (devid) == PCI_CHIP_KABYLAKE_DT_GT2 || \ ++ (devid) == PCI_CHIP_KABYLAKE_M_GT2 || \ + (devid) == PCI_CHIP_KABYLAKE_HALO_GT2 || \ + (devid) == PCI_CHIP_KABYLAKE_SRV_GT2 || \ + (devid) == PCI_CHIP_KABYLAKE_WKS_GT2) +-- +2.9.5 + diff --git a/SOURCES/0002-intel-Add-more-Coffeelake-PCI-IDs.patch b/SOURCES/0002-intel-Add-more-Coffeelake-PCI-IDs.patch new file mode 100644 index 0000000..2a3deac --- /dev/null +++ b/SOURCES/0002-intel-Add-more-Coffeelake-PCI-IDs.patch @@ -0,0 +1,78 @@ +From 0fda9532e2f187f03b45ad29d2d151c500d64533 Mon Sep 17 00:00:00 2001 +From: Anuj Phogat +Date: Wed, 10 Jan 2018 15:51:02 -0800 +Subject: [PATCH 2/2] intel: Add more Coffeelake PCI IDs + +Cc: Rodrigo Vivi +Cc: Anusha Srivatsa +Signed-off-by: Anuj Phogat +Reviewed-by: Rodrigo Vivi +Signed-off-by: Rodrigo Vivi +--- + intel/intel_chipset.h | 30 +++++++++++++++++++++++------- + 1 file changed, 23 insertions(+), 7 deletions(-) + +diff --git a/intel/intel_chipset.h b/intel/intel_chipset.h +index d81b1646..3818e71e 100644 +--- a/intel/intel_chipset.h ++++ b/intel/intel_chipset.h +@@ -223,15 +223,23 @@ + + #define PCI_CHIP_COFFEELAKE_S_GT1_1 0x3E90 + #define PCI_CHIP_COFFEELAKE_S_GT1_2 0x3E93 ++#define PCI_CHIP_COFFEELAKE_S_GT1_3 0x3E99 + #define PCI_CHIP_COFFEELAKE_S_GT2_1 0x3E91 + #define PCI_CHIP_COFFEELAKE_S_GT2_2 0x3E92 + #define PCI_CHIP_COFFEELAKE_S_GT2_3 0x3E96 ++#define PCI_CHIP_COFFEELAKE_S_GT2_4 0x3E9A + #define PCI_CHIP_COFFEELAKE_H_GT2_1 0x3E9B + #define PCI_CHIP_COFFEELAKE_H_GT2_2 0x3E94 +-#define PCI_CHIP_COFFEELAKE_U_GT3_1 0x3EA5 +-#define PCI_CHIP_COFFEELAKE_U_GT3_2 0x3EA6 +-#define PCI_CHIP_COFFEELAKE_U_GT3_3 0x3EA7 +-#define PCI_CHIP_COFFEELAKE_U_GT3_4 0x3EA8 ++#define PCI_CHIP_COFFEELAKE_U_GT1_1 0x3EA1 ++#define PCI_CHIP_COFFEELAKE_U_GT1_2 0x3EA4 ++#define PCI_CHIP_COFFEELAKE_U_GT2_1 0x3EA0 ++#define PCI_CHIP_COFFEELAKE_U_GT2_2 0x3EA3 ++#define PCI_CHIP_COFFEELAKE_U_GT2_3 0x3EA9 ++#define PCI_CHIP_COFFEELAKE_U_GT3_1 0x3EA2 ++#define PCI_CHIP_COFFEELAKE_U_GT3_2 0x3EA5 ++#define PCI_CHIP_COFFEELAKE_U_GT3_3 0x3EA6 ++#define PCI_CHIP_COFFEELAKE_U_GT3_4 0x3EA7 ++#define PCI_CHIP_COFFEELAKE_U_GT3_5 0x3EA8 + + #define PCI_CHIP_CANNONLAKE_U_GT2_0 0x5A52 + #define PCI_CHIP_CANNONLAKE_U_GT2_1 0x5A5A +@@ -477,17 +485,25 @@ + + #define IS_CFL_S(devid) ((devid) == PCI_CHIP_COFFEELAKE_S_GT1_1 || \ + (devid) == PCI_CHIP_COFFEELAKE_S_GT1_2 || \ ++ (devid) == PCI_CHIP_COFFEELAKE_S_GT1_3 || \ + (devid) == PCI_CHIP_COFFEELAKE_S_GT2_1 || \ + (devid) == PCI_CHIP_COFFEELAKE_S_GT2_2 || \ +- (devid) == PCI_CHIP_COFFEELAKE_S_GT2_3) ++ (devid) == PCI_CHIP_COFFEELAKE_S_GT2_3 || \ ++ (devid) == PCI_CHIP_COFFEELAKE_S_GT2_4) + + #define IS_CFL_H(devid) ((devid) == PCI_CHIP_COFFEELAKE_H_GT2_1 || \ + (devid) == PCI_CHIP_COFFEELAKE_H_GT2_2) + +-#define IS_CFL_U(devid) ((devid) == PCI_CHIP_COFFEELAKE_U_GT3_1 || \ ++#define IS_CFL_U(devid) ((devid) == PCI_CHIP_COFFEELAKE_U_GT1_1 || \ ++ (devid) == PCI_CHIP_COFFEELAKE_U_GT1_2 || \ ++ (devid) == PCI_CHIP_COFFEELAKE_U_GT2_1 || \ ++ (devid) == PCI_CHIP_COFFEELAKE_U_GT2_2 || \ ++ (devid) == PCI_CHIP_COFFEELAKE_U_GT2_3 || \ ++ (devid) == PCI_CHIP_COFFEELAKE_U_GT3_1 || \ + (devid) == PCI_CHIP_COFFEELAKE_U_GT3_2 || \ + (devid) == PCI_CHIP_COFFEELAKE_U_GT3_3 || \ +- (devid) == PCI_CHIP_COFFEELAKE_U_GT3_4) ++ (devid) == PCI_CHIP_COFFEELAKE_U_GT3_4 || \ ++ (devid) == PCI_CHIP_COFFEELAKE_U_GT3_5) + + #define IS_COFFEELAKE(devid) (IS_CFL_S(devid) || \ + IS_CFL_H(devid) || \ +-- +2.14.3 + diff --git a/SOURCES/libdrm-2.4.25-check-programs.patch b/SOURCES/libdrm-2.4.25-check-programs.patch index 9901755..5debb03 100644 --- a/SOURCES/libdrm-2.4.25-check-programs.patch +++ b/SOURCES/libdrm-2.4.25-check-programs.patch @@ -1,10 +1,10 @@ -diff -up libdrm-2.4.67/tests/Makefile.am.check libdrm-2.4.67/tests/Makefile.am ---- libdrm-2.4.67/tests/Makefile.am.check 2016-02-19 15:32:46.197712477 +1000 -+++ libdrm-2.4.67/tests/Makefile.am 2016-02-19 15:33:33.300996618 +1000 -@@ -73,3 +73,6 @@ TESTS += \ - endif - - check_PROGRAMS += $(TESTS) +diff -up libdrm-2.4.82/tests/Makefile.am.check libdrm-2.4.82/tests/Makefile.am +--- libdrm-2.4.82/tests/Makefile.am.check 2017-08-10 09:44:12.380441220 +1000 ++++ libdrm-2.4.82/tests/Makefile.am 2017-08-10 09:45:13.349056689 +1000 +@@ -45,3 +45,6 @@ TESTS = \ + check_PROGRAMS = \ + $(TESTS) \ + drmdevice + +check-programs: + @echo $(check_PROGRAMS) diff --git a/SPECS/libdrm.spec b/SPECS/libdrm.spec index 5d536ec..ec1566b 100644 --- a/SPECS/libdrm.spec +++ b/SPECS/libdrm.spec @@ -2,8 +2,8 @@ Summary: Direct Rendering Manager runtime library Name: libdrm -Version: 2.4.74 -Release: 1%{?dist} +Version: 2.4.83 +Release: 2%{?dist} License: MIT Group: System Environment/Libraries URL: http://dri.sourceforge.net @@ -34,6 +34,8 @@ BuildRequires: xorg-x11-util-macros Source2: 91-drm-modeset.rules +# backport from upstream master seems like it should be in here. +Patch1: 0001-intel-Change-a-KBL-pci-id-to-GT2-from-GT1.5.patch # hardcode the 666 instead of 660 for device nodes Patch3: libdrm-make-dri-perms-okay.patch # remove backwards compat not needed on Fedora @@ -41,6 +43,9 @@ Patch4: libdrm-2.4.0-no-bc.patch # make rule to print the list of test programs Patch5: libdrm-2.4.25-check-programs.patch +#Backport some intel pci ids. +Patch10: 0002-intel-Add-more-Coffeelake-PCI-IDs.patch + %description Direct Rendering Manager runtime library @@ -64,10 +69,13 @@ Utility programs for the kernel DRM interface. Will void your warranty. %prep %setup -q %{?gitdate:-n %{name}-%{gitdate}} +%patch1 -p1 -b .intelfix %patch3 -p1 -b .forceperms %patch4 -p1 -b .no-bc %patch5 -p1 -b .check +%patch10 -p1 -b .cfl + %build autoreconf -v --install || exit 1 %configure \ @@ -134,20 +142,12 @@ done %{_libdir}/libdrm_nouveau.so.2.0.0 %{_libdir}/libkms.so.1 %{_libdir}/libkms.so.1.0.0 +%{_datadir}/libdrm/amdgpu.ids /usr/lib/udev/rules.d/91-drm-modeset.rules %files -n drm-utils %defattr(-,root,root,-) -%{_bindir}/dristat -%{_bindir}/drmstat %{_bindir}/drmdevice -%{_bindir}/getclient -%{_bindir}/getstats -%{_bindir}/getversion -%{_bindir}/name_from_fd -%{_bindir}/openclose -%{_bindir}/setversion -%{_bindir}/updatedraw %{_bindir}/modetest %{_bindir}/modeprint %{_bindir}/vbltest @@ -238,6 +238,12 @@ done %{_mandir}/man7/drm*.7* %changelog +* Fri Jan 12 2018 Dave Airlie - 2.4.83-2 +- Add some Coffeelake PCI IDs + +* Fri Oct 06 2017 Dave Airlie - 2.4.83-1 +- libdrm 2.4.83 + * Wed Jan 18 2017 Dave Airlie - 2.4.74-1 - libdrm 2.4.74