backport two fixes from master
This commit is contained in:
Dave Airlie
parent
5b852a44a2
commit
5457aea3f2
@ -0,0 +1,32 @@
|
||||
From c8a437f4c76527b3c8385699ccee07f35fe3f166 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com>
|
||||
Date: Tue, 26 Nov 2013 18:16:03 +0900
|
||||
Subject: [PATCH 1/2] radeon: Update unaligned offset for 2D->1D tiling
|
||||
transition on SI
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71983
|
||||
|
||||
Tested-by: Arek Ruśniak <arek.rusi@gmail.com>
|
||||
---
|
||||
radeon/radeon_surface.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/radeon/radeon_surface.c b/radeon/radeon_surface.c
|
||||
index b528a48..dcbbfdc 100644
|
||||
--- a/radeon/radeon_surface.c
|
||||
+++ b/radeon/radeon_surface.c
|
||||
@@ -1667,7 +1667,7 @@ static int si_surface_init_2d(struct radeon_surface_manager *surf_man,
|
||||
return si_surface_init_1d(surf_man, surf, level, bpe, tile_mode, offset, i);
|
||||
}
|
||||
/* level0 and first mipmap need to have alignment */
|
||||
- aligned_offset = surf->bo_size;
|
||||
+ aligned_offset = offset = surf->bo_size;
|
||||
if ((i == 0)) {
|
||||
aligned_offset = ALIGN(aligned_offset, surf->bo_alignment);
|
||||
}
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
131
0002-intel-Track-known-prime-buffers-for-re-use.patch
Normal file
131
0002-intel-Track-known-prime-buffers-for-re-use.patch
Normal file
@ -0,0 +1,131 @@
|
||||
From c3d96897de647bd5f6d4802c108a3f65a307d61b Mon Sep 17 00:00:00 2001
|
||||
From: Keith Packard <keithp@keithp.com>
|
||||
Date: Fri, 22 Nov 2013 05:31:01 -0800
|
||||
Subject: [PATCH 2/2] intel: Track known prime buffers for re-use
|
||||
|
||||
If the application sends us a file descriptor pointing at a prime
|
||||
buffer that we've already got, we have to re-use the same bo_gem
|
||||
structure or chaos will result.
|
||||
|
||||
Track the set of all known prime objects and look to see if the kernel
|
||||
has returned one of those for a new file descriptor.
|
||||
|
||||
Also checks for prime buffers in the flink case.
|
||||
|
||||
Signed-off-by: Keith Packard <keithp@keithp.com>
|
||||
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
|
||||
---
|
||||
intel/intel_bufmgr_gem.c | 50 +++++++++++++++++++++++++++++++++++++++++-------
|
||||
1 file changed, 43 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
|
||||
index c11ed45..48ff62e 100644
|
||||
--- a/intel/intel_bufmgr_gem.c
|
||||
+++ b/intel/intel_bufmgr_gem.c
|
||||
@@ -149,6 +149,8 @@ struct _drm_intel_bo_gem {
|
||||
|
||||
/**
|
||||
* Kenel-assigned global name for this object
|
||||
+ *
|
||||
+ * List contains both flink named and prime fd'd objects
|
||||
*/
|
||||
unsigned int global_name;
|
||||
drmMMListHead name_list;
|
||||
@@ -862,10 +864,6 @@ drm_intel_bo_gem_create_from_name(drm_intel_bufmgr *bufmgr,
|
||||
}
|
||||
}
|
||||
|
||||
- bo_gem = calloc(1, sizeof(*bo_gem));
|
||||
- if (!bo_gem)
|
||||
- return NULL;
|
||||
-
|
||||
VG_CLEAR(open_arg);
|
||||
open_arg.name = handle;
|
||||
ret = drmIoctl(bufmgr_gem->fd,
|
||||
@@ -874,9 +872,26 @@ drm_intel_bo_gem_create_from_name(drm_intel_bufmgr *bufmgr,
|
||||
if (ret != 0) {
|
||||
DBG("Couldn't reference %s handle 0x%08x: %s\n",
|
||||
name, handle, strerror(errno));
|
||||
- free(bo_gem);
|
||||
return NULL;
|
||||
}
|
||||
+ /* Now see if someone has used a prime handle to get this
|
||||
+ * object from the kernel before by looking through the list
|
||||
+ * again for a matching gem_handle
|
||||
+ */
|
||||
+ for (list = bufmgr_gem->named.next;
|
||||
+ list != &bufmgr_gem->named;
|
||||
+ list = list->next) {
|
||||
+ bo_gem = DRMLISTENTRY(drm_intel_bo_gem, list, name_list);
|
||||
+ if (bo_gem->gem_handle == open_arg.handle) {
|
||||
+ drm_intel_gem_bo_reference(&bo_gem->bo);
|
||||
+ return &bo_gem->bo;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ bo_gem = calloc(1, sizeof(*bo_gem));
|
||||
+ if (!bo_gem)
|
||||
+ return NULL;
|
||||
+
|
||||
bo_gem->bo.size = open_arg.size;
|
||||
bo_gem->bo.offset = 0;
|
||||
bo_gem->bo.virtual = NULL;
|
||||
@@ -2451,8 +2466,25 @@ drm_intel_bo_gem_create_from_prime(drm_intel_bufmgr *bufmgr, int prime_fd, int s
|
||||
uint32_t handle;
|
||||
drm_intel_bo_gem *bo_gem;
|
||||
struct drm_i915_gem_get_tiling get_tiling;
|
||||
+ drmMMListHead *list;
|
||||
|
||||
ret = drmPrimeFDToHandle(bufmgr_gem->fd, prime_fd, &handle);
|
||||
+
|
||||
+ /*
|
||||
+ * See if the kernel has already returned this buffer to us. Just as
|
||||
+ * for named buffers, we must not create two bo's pointing at the same
|
||||
+ * kernel object
|
||||
+ */
|
||||
+ for (list = bufmgr_gem->named.next;
|
||||
+ list != &bufmgr_gem->named;
|
||||
+ list = list->next) {
|
||||
+ bo_gem = DRMLISTENTRY(drm_intel_bo_gem, list, name_list);
|
||||
+ if (bo_gem->gem_handle == handle) {
|
||||
+ drm_intel_gem_bo_reference(&bo_gem->bo);
|
||||
+ return &bo_gem->bo;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
if (ret) {
|
||||
fprintf(stderr,"ret is %d %d\n", ret, errno);
|
||||
return NULL;
|
||||
@@ -2487,8 +2519,8 @@ drm_intel_bo_gem_create_from_prime(drm_intel_bufmgr *bufmgr, int prime_fd, int s
|
||||
bo_gem->has_error = false;
|
||||
bo_gem->reusable = false;
|
||||
|
||||
- DRMINITLISTHEAD(&bo_gem->name_list);
|
||||
DRMINITLISTHEAD(&bo_gem->vma_list);
|
||||
+ DRMLISTADDTAIL(&bo_gem->name_list, &bufmgr_gem->named);
|
||||
|
||||
VG_CLEAR(get_tiling);
|
||||
get_tiling.handle = bo_gem->gem_handle;
|
||||
@@ -2513,6 +2545,9 @@ drm_intel_bo_gem_export_to_prime(drm_intel_bo *bo, int *prime_fd)
|
||||
drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bo->bufmgr;
|
||||
drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo;
|
||||
|
||||
+ if (DRMLISTEMPTY(&bo_gem->name_list))
|
||||
+ DRMLISTADDTAIL(&bo_gem->name_list, &bufmgr_gem->named);
|
||||
+
|
||||
if (drmPrimeHandleToFD(bufmgr_gem->fd, bo_gem->gem_handle,
|
||||
DRM_CLOEXEC, prime_fd) != 0)
|
||||
return -errno;
|
||||
@@ -2542,7 +2577,8 @@ drm_intel_gem_bo_flink(drm_intel_bo *bo, uint32_t * name)
|
||||
bo_gem->global_name = flink.name;
|
||||
bo_gem->reusable = false;
|
||||
|
||||
- DRMLISTADDTAIL(&bo_gem->name_list, &bufmgr_gem->named);
|
||||
+ if (DRMLISTEMPTY(&bo_gem->name_list))
|
||||
+ DRMLISTADDTAIL(&bo_gem->name_list, &bufmgr_gem->named);
|
||||
}
|
||||
|
||||
*name = bo_gem->global_name;
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
11
libdrm.spec
11
libdrm.spec
@ -3,7 +3,7 @@
|
||||
Summary: Direct Rendering Manager runtime library
|
||||
Name: libdrm
|
||||
Version: 2.4.49
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
License: MIT
|
||||
Group: System Environment/Libraries
|
||||
URL: http://dri.sourceforge.net
|
||||
@ -30,6 +30,10 @@ BuildRequires: libxslt docbook-style-xsl
|
||||
|
||||
Source2: 91-drm-modeset.rules
|
||||
|
||||
# backports from master
|
||||
Patch0: 0001-radeon-Update-unaligned-offset-for-2D-1D-tiling-tran.patch
|
||||
Patch1: 0002-intel-Track-known-prime-buffers-for-re-use.patch
|
||||
|
||||
# hardcode the 666 instead of 660 for device nodes
|
||||
Patch3: libdrm-make-dri-perms-okay.patch
|
||||
# remove backwards compat not needed on Fedora
|
||||
@ -59,6 +63,8 @@ Utility programs for the kernel DRM interface. Will void your warranty.
|
||||
|
||||
%prep
|
||||
%setup -q %{?gitdate:-n %{name}-%{gitdate}}
|
||||
%patch0 -p1 -b .rad
|
||||
%patch1 -p1 -b .intel
|
||||
%patch3 -p1 -b .forceperms
|
||||
%patch4 -p1 -b .no-bc
|
||||
%patch5 -p1 -b .check
|
||||
@ -203,6 +209,9 @@ done
|
||||
%{_mandir}/man7/drm*.7*
|
||||
|
||||
%changelog
|
||||
* Mon Dec 02 2013 Dave Airlie <airlied@redhat.com> 2.4.49-2
|
||||
- backport two fixes from master
|
||||
|
||||
* Sun Nov 24 2013 Dave Airlie <airlied@redhat.com> 2.4.49-1
|
||||
- libdrm 2.4.49
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user