pool/libdrm
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 52361 from X11:XOrg

Browse Source 
Accepted submit request 52361 from user sndirsch

OBS-URL: https://build.opensuse.org/request/show/52361
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libdrm?expand=0&rev=40
This commit is contained in:
Ruediger Oertel 2010-11-08 11:52:43 +00:00 committed by Git OBS Bridge
commit fdc8be1ad9
5 changed files with 53 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
intel-initialize-bufmgr.bo_mrb_exec-unconditionally.patch Normal file
View File

@ -0,0 +1,34 @@
From 49447a9b957047db2549b8a929e763bbd87808ba Mon Sep 17 00:00:00 2001
From: Albert Damen <albrt@gmx.net>
Date: Sun, 7 Nov 2010 15:54:32 +0100
Subject: [PATCH] intel: initialize bufmgr.bo_mrb_exec unconditionally
If bufmgr.bo_mrb_exec is not set, drm_intel_bo_mrb_exec returns ENODEV
even though drm_intel_gem_bo_mrb_exec2 will work fine for the RENDER ring.
Fixes xf86-video-intel after commit 'add BLT ring support' (5bed685f76)
with kernels without BSD or BLT ring support (2.6.34 and before).
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=31443
Signed-off-by: Albert Damen <albrt@gmx.net>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
intel/intel_bufmgr_gem.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
index 2da3a8a..2b7bd47 100644
--- a/intel/intel_bufmgr_gem.c
+++ b/intel/intel_bufmgr_gem.c
@@ -2184,8 +2184,7 @@ drm_intel_bufmgr_gem_init(int fd, int batch_size)
/* Use the new one if available */
if (exec2) {
bufmgr_gem->bufmgr.bo_exec = drm_intel_gem_bo_exec2;
- if (bufmgr_gem->has_bsd|bufmgr_gem->has_blt)
- bufmgr_gem->bufmgr.bo_mrb_exec = drm_intel_gem_bo_mrb_exec2;
+ bufmgr_gem->bufmgr.bo_mrb_exec = drm_intel_gem_bo_mrb_exec2;
} else
bufmgr_gem->bufmgr.bo_exec = drm_intel_gem_bo_exec;
bufmgr_gem->bufmgr.bo_busy = drm_intel_gem_bo_busy;
--
1.7.3.1

3
libdrm-2.4.22_101031_d0a4f2e.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ca7c296449d09bf6fe5e4f1a7db595677614ecc42a478fa00ad44617f9478618
size 391381

3
libdrm-2.4.22_101102_a52e61b.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f83abe5390bbffeabc03c33c74436450750c4fbb540ff78baa6a02c53bf304f7
size 390855

12
libdrm.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Nov 8 09:02:40 UTC 2010 - sndirsch@novell.com
- intel-initialize-bufmgr.bo_mrb_exec-unconditionally.patch
* no longer require kernels without BLT ring support (2.6.34 an
before). (bnc #651989, bnc #651501)
-------------------------------------------------------------------
Sat Nov 6 00:29:27 UTC 2010 - sndirsch@novell.com
- updated to git master commit #a52e61b (2010-11-02, still 2.4.22)
-------------------------------------------------------------------
Tue Nov 2 13:28:24 UTC 2010 - sndirsch@novell.com

6
libdrm.spec
View File

@ -35,10 +35,11 @@ Provides: libdrm-64bit = %{version}
%endif
#
Summary: Userspace Interface for Kernel DRM Services
Source: %{name}-%{version}_101031_d0a4f2e.tar.bz2
Source: %{name}-%{version}_101102_a52e61b.tar.bz2
Source2: baselibs.conf
Patch: enable_test_tools.diff
Patch1: revert-09b1062.diff
Patch2: intel-initialize-bufmgr.bo_mrb_exec-unconditionally.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -63,9 +64,10 @@ The package contains the userspace interface to the kernel DRM
services.
%prep
%setup -q -n %{name}-%{version}_101031_d0a4f2e
%setup -q -n %{name}-%{version}_101102_a52e61b
%patch
%patch1 -p1
%patch2 -p1
%build
autoreconf -fi