Browse Source

libdrm package update

Signed-off-by: guibuilder_pel7x64builder0 <guibuilder@powerel.org>
master
guibuilder_pel7x64builder0 4 years ago
parent
commit
26503146fa
  1. 32
      SOURCES/0001-amdgpu-add-some-raven-marketing-names.patch
  2. 117
      SOURCES/0001-intel-sync-i915_pciids.h-with-kernel.patch
  3. 61
      SOURCES/README.rst
  4. 14
      SOURCES/libdrm-2.4.25-check-programs.patch
  5. 33
      SPECS/libdrm.spec

32
SOURCES/0001-amdgpu-add-some-raven-marketing-names.patch

@ -0,0 +1,32 @@ @@ -0,0 +1,32 @@
From 6415bd3ced9d80137e30cb90837eb01932607882 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@amd.com>
Date: Wed, 30 Jan 2019 11:32:03 -0500
Subject: [PATCH libdrm] amdgpu: add some raven marketing names
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
data/amdgpu.ids | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/data/amdgpu.ids b/data/amdgpu.ids
index d9ed5660..d24c7ee6 100644
--- a/data/amdgpu.ids
+++ b/data/amdgpu.ids
@@ -4,6 +4,10 @@
# device_id, revision_id, product_name <-- single tab after comma
1.0.0
+15DD, 81, AMD Ryzen Embedded V1807B with Radeon Vega Gfx
+15DD, 82, AMD Ryzen Embedded V1756B with Radeon Vega Gfx
+15DD, 83, AMD Ryzen Embedded V1605B with Radeon Vega Gfx
+15DD, 85, AMD Ryzen Embedded V1202B with Radeon Vega Gfx
6600, 0, AMD Radeon HD 8600/8700M
6600, 81, AMD Radeon (TM) R7 M370
6601, 0, AMD Radeon (TM) HD 8500M/8700M
--
2.20.1

117
SOURCES/0001-intel-sync-i915_pciids.h-with-kernel.patch

@ -0,0 +1,117 @@ @@ -0,0 +1,117 @@
From 70a1ae89be6b9f9a535f1fbaff3e4b1c4bb46d4a Mon Sep 17 00:00:00 2001
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Date: Fri, 1 Feb 2019 23:43:01 -0800
Subject: [PATCH libdrm] intel: sync i915_pciids.h with kernel
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Straight copy from the kernel file.

Add more PCI Device IDs for Coffee Lake, Ice Lake,
and Amber Lake. It also include a reorg on Whiskey Lake IDs.

Align with kernel commits:

5e0f5a58b167 ("drm/i915/cfl: Adding another PCI Device ID.")
03ca3cf8e9aa ("drm/i915/icl: Adding few more device IDs for Ice Lake")
c0c46ca461f1 ("drm/i915/aml: Add new Amber Lake PCI ID")
c1c8f6fa731b ("drm/i915: Redefine some Whiskey Lake SKUs")

Cc: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---
intel/i915_pciids.h | 29 +++++++++++++++++++++--------
1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/intel/i915_pciids.h b/intel/i915_pciids.h
index fd965ffb..d2fad7b0 100644
--- a/intel/i915_pciids.h
+++ b/intel/i915_pciids.h
@@ -365,16 +365,20 @@
INTEL_VGA_DEVICE(0x593B, info) /* Halo GT4 */
/* AML/KBL Y GT2 */
-#define INTEL_AML_GT2_IDS(info) \
+#define INTEL_AML_KBL_GT2_IDS(info) \
INTEL_VGA_DEVICE(0x591C, info), /* ULX GT2 */ \
INTEL_VGA_DEVICE(0x87C0, info) /* ULX GT2 */
+/* AML/CFL Y GT2 */
+#define INTEL_AML_CFL_GT2_IDS(info) \
+ INTEL_VGA_DEVICE(0x87CA, info)
+
#define INTEL_KBL_IDS(info) \
INTEL_KBL_GT1_IDS(info), \
INTEL_KBL_GT2_IDS(info), \
INTEL_KBL_GT3_IDS(info), \
INTEL_KBL_GT4_IDS(info), \
- INTEL_AML_GT2_IDS(info)
+ INTEL_AML_KBL_GT2_IDS(info)
/* CFL S */
#define INTEL_CFL_S_GT1_IDS(info) \
@@ -390,6 +394,9 @@
INTEL_VGA_DEVICE(0x3E9A, info) /* SRV GT2 */
/* CFL H */
+#define INTEL_CFL_H_GT1_IDS(info) \
+ INTEL_VGA_DEVICE(0x3E9C, info)
+
#define INTEL_CFL_H_GT2_IDS(info) \
INTEL_VGA_DEVICE(0x3E9B, info), /* Halo GT2 */ \
INTEL_VGA_DEVICE(0x3E94, info) /* Halo GT2 */
@@ -407,27 +414,29 @@
/* WHL/CFL U GT1 */
#define INTEL_WHL_U_GT1_IDS(info) \
- INTEL_VGA_DEVICE(0x3EA1, info)
+ INTEL_VGA_DEVICE(0x3EA1, info), \
+ INTEL_VGA_DEVICE(0x3EA4, info)
/* WHL/CFL U GT2 */
#define INTEL_WHL_U_GT2_IDS(info) \
- INTEL_VGA_DEVICE(0x3EA0, info)
+ INTEL_VGA_DEVICE(0x3EA0, info), \
+ INTEL_VGA_DEVICE(0x3EA3, info)
/* WHL/CFL U GT3 */
#define INTEL_WHL_U_GT3_IDS(info) \
- INTEL_VGA_DEVICE(0x3EA2, info), \
- INTEL_VGA_DEVICE(0x3EA3, info), \
- INTEL_VGA_DEVICE(0x3EA4, info)
+ INTEL_VGA_DEVICE(0x3EA2, info)
#define INTEL_CFL_IDS(info) \
INTEL_CFL_S_GT1_IDS(info), \
INTEL_CFL_S_GT2_IDS(info), \
+ INTEL_CFL_H_GT1_IDS(info), \
INTEL_CFL_H_GT2_IDS(info), \
INTEL_CFL_U_GT2_IDS(info), \
INTEL_CFL_U_GT3_IDS(info), \
INTEL_WHL_U_GT1_IDS(info), \
INTEL_WHL_U_GT2_IDS(info), \
- INTEL_WHL_U_GT3_IDS(info)
+ INTEL_WHL_U_GT3_IDS(info), \
+ INTEL_AML_CFL_GT2_IDS(info)
/* CNL */
#define INTEL_CNL_IDS(info) \
@@ -452,9 +461,13 @@
INTEL_VGA_DEVICE(0x8A51, info), \
INTEL_VGA_DEVICE(0x8A5C, info), \
INTEL_VGA_DEVICE(0x8A5D, info), \
+ INTEL_VGA_DEVICE(0x8A59, info), \
+ INTEL_VGA_DEVICE(0x8A58, info), \
INTEL_VGA_DEVICE(0x8A52, info), \
INTEL_VGA_DEVICE(0x8A5A, info), \
INTEL_VGA_DEVICE(0x8A5B, info), \
+ INTEL_VGA_DEVICE(0x8A57, info), \
+ INTEL_VGA_DEVICE(0x8A56, info), \
INTEL_VGA_DEVICE(0x8A71, info), \
INTEL_VGA_DEVICE(0x8A70, info)
--
2.20.1

61
SOURCES/README.rst

@ -0,0 +1,61 @@ @@ -0,0 +1,61 @@
libdrm - userspace library for drm
----------------------------------

This is libdrm, a userspace library for accessing the DRM, direct rendering
manager, on Linux, BSD and other operating systems that support the ioctl
interface.
The library provides wrapper functions for the ioctls to avoid exposing the
kernel interface directly, and for chipsets with drm memory manager, support
for tracking relocations and buffers.
New functionality in the kernel DRM drivers typically requires a new libdrm,
but a new libdrm will always work with an older kernel.

libdrm is a low-level library, typically used by graphics drivers such as
the Mesa drivers, the X drivers, libva and similar projects.


Compiling
---------

libdrm has two build systems, a legacy autotools build system, and a newer
meson build system. The meson build system is much faster, and offers a
slightly different interface, but otherwise provides an equivalent feature set.

To use it:

meson builddir/

By default this will install into /usr/local, you can change your prefix
with --prefix=/usr (or `meson configure builddir/ -Dprefix=/usr` after
the initial meson setup).

Then use ninja to build and install:

ninja -C builddir/ install

If you are installing into a system location you will need to run install
separately, and as root.


Alternatively you can invoke autotools configure:

./configure

By default, libdrm will install into the /usr/local/ prefix. If you
want to install this DRM to replace your system copy, pass
--prefix=/usr and --exec-prefix=/ to configure. If you are building
libdrm from a git checkout, you first need to run the autogen.sh
script. You can pass any options to autogen.sh that you would other
wise pass to configure, or you can just re-run configure with the
options you need once autogen.sh finishes.

Next step is to build libdrm:

make

and once make finishes successfully, install the package using

make install

If you are installing into a system location, you will need to be root
to perform the install step.

14
SOURCES/libdrm-2.4.25-check-programs.patch

@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
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
diff -up libdrm-2.4.97/tests/Makefile.am.check libdrm-2.4.97/tests/Makefile.am
--- libdrm-2.4.97/tests/Makefile.am.check 2019-01-31 11:00:21.248243193 +1000
+++ libdrm-2.4.97/tests/Makefile.am 2019-01-31 11:05:28.380528292 +1000
@@ -51,3 +51,6 @@ bin_PROGRAMS = drmdevice
else
check_PROGRAMS += drmdevice
endif
+
+check-programs:
+ @echo $(check_PROGRAMS)

33
SPECS/libdrm.spec

@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@

Summary: Direct Rendering Manager runtime library
Name: libdrm
Version: 2.4.91
Release: 3%{?dist}
Version: 2.4.97
Release: 2%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://dri.sourceforge.net
@ -33,6 +33,7 @@ BuildRequires: valgrind-devel @@ -33,6 +33,7 @@ BuildRequires: valgrind-devel
BuildRequires: xorg-x11-util-macros

Source2: 91-drm-modeset.rules
Source3: README.rst

# hardcode the 666 instead of 660 for device nodes
Patch3: libdrm-make-dri-perms-okay.patch
@ -41,12 +42,10 @@ Patch4: libdrm-2.4.0-no-bc.patch @@ -41,12 +42,10 @@ 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 new intel pci-ids
Patch10: 0001-intel-intel_chipset.h-Sync-Cannonlake-IDs.patch
Patch11: 0001-Intel-Add-a-Kaby-Lake-PCI-ID.patch
Patch12: 0001-intel-add-support-for-ICL-11.patch
Patch13: 0001-intel-Introducing-Whiskey-Lake-platform.patch
Patch14: 0001-intel-Introducing-Amber-Lake-platform.patch
# amdgpu names update
Patch10: 0001-amdgpu-add-some-raven-marketing-names.patch
# intel pciids update
Patch11: 0001-intel-sync-i915_pciids.h-with-kernel.patch

%description
Direct Rendering Manager runtime library
@ -74,12 +73,8 @@ Utility programs for the kernel DRM interface. Will void your warranty. @@ -74,12 +73,8 @@ Utility programs for the kernel DRM interface. Will void your warranty.
%patch3 -p1 -b .forceperms
%patch4 -p1 -b .no-bc
%patch5 -p1 -b .check

%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch10 -p1 -b .amdnames
%patch11 -p1 -b .intelid

%build
autoreconf -v --install || exit 1
@ -95,6 +90,7 @@ make %{?_smp_mflags} @@ -95,6 +90,7 @@ make %{?_smp_mflags}
pushd tests
make %{?smp_mflags} `make check-programs`
popd
cp %{SOURCE3} .

%install
make install DESTDIR=$RPM_BUILD_ROOT
@ -104,6 +100,7 @@ for foo in $(make check-programs) ; do @@ -104,6 +100,7 @@ for foo in $(make check-programs) ; do
libtool --mode=install install -m 0755 $foo %{buildroot}%{_bindir}
done
popd

# SUBDIRS=libdrm
mkdir -p $RPM_BUILD_ROOT/usr/lib/udev/rules.d/
install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/udev/rules.d/
@ -120,7 +117,7 @@ done @@ -120,7 +117,7 @@ done

%files
%defattr(-,root,root,-)
%doc README
%doc README.rst
%{_libdir}/libdrm.so.2
%{_libdir}/libdrm.so.2.4.0
%ifarch %{ix86} x86_64 ia64
@ -243,6 +240,12 @@ done @@ -243,6 +240,12 @@ done
%{_mandir}/man7/drm*.7*

%changelog
* Wed Feb 20 2019 Dave Airlie <airlied@redhat.com> - 2.4.97-2
- Add some new i915 pci ids, and amd marketing names

* Thu Jan 31 2019 Dave Airlie <airlied@redhat.com> - 2.4.97-1
- libdrm 2.4.97 (readd README)

* Wed Aug 22 2018 Rob Clark <rclark@redhat.com> - 2.4.91-3
- Add WHL, AML, etc PCI IDs


Loading…
Cancel
Save