Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 405170 Details for
Bug 552124
x11-drivers/xf86-video-intel-2.99.917-r1 crashes with SNA, but works with UXA
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch that solves the breakage
xf86-video-intel-2.99.917-kernel-4.0-sna.patch (text/plain), 1.97 KB, created by
jorgicio
on 2015-06-15 02:30:58 UTC
(
hide
)
Description:
Patch that solves the breakage
Filename:
MIME Type:
Creator:
jorgicio
Created:
2015-06-15 02:30:58 UTC
Size:
1.97 KB
patch
obsolete
>commit 7fe2b2948652443ff43d907855bd7a051d54d309 >Author: Chris Wilson <chris@chris-wilson.co.uk> >Date: Thu Mar 19 23:14:17 2015 +0000 > > sna: Protect against ABI breakage in recent versions of libdrm > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > >diff --git a/src/sna/kgem.c b/src/sna/kgem.c >index 11f0828..6f16cba 100644 >--- a/src/sna/kgem.c >+++ b/src/sna/kgem.c >@@ -182,6 +182,15 @@ struct local_i915_gem_caching { > #define LOCAL_IOCTL_I915_GEM_SET_CACHING DRM_IOW(DRM_COMMAND_BASE + LOCAL_I915_GEM_SET_CACHING, struct local_i915_gem_caching) > #define LOCAL_IOCTL_I915_GEM_GET_CACHING DRM_IOW(DRM_COMMAND_BASE + LOCAL_I915_GEM_GET_CACHING, struct local_i915_gem_caching) > >+struct local_i915_gem_mmap { >+ uint32_t handle; >+ uint32_t pad; >+ uint64_t offset; >+ uint64_t size; >+ uint64_t addr_ptr; >+}; >+#define LOCAL_IOCTL_I915_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP, struct local_i915_gem_mmap) >+ > struct local_i915_gem_mmap2 { > uint32_t handle; > uint32_t pad; >@@ -514,15 +523,15 @@ retry_wc: > > static void *__kgem_bo_map__cpu(struct kgem *kgem, struct kgem_bo *bo) > { >- struct drm_i915_gem_mmap mmap_arg; >+ struct local_i915_gem_mmap arg; > int err; > > retry: >- VG_CLEAR(mmap_arg); >- mmap_arg.handle = bo->handle; >- mmap_arg.offset = 0; >- mmap_arg.size = bytes(bo); >- if ((err = do_ioctl(kgem->fd, DRM_IOCTL_I915_GEM_MMAP, &mmap_arg))) { >+ VG_CLEAR(arg); >+ arg.handle = bo->handle; >+ arg.offset = 0; >+ arg.size = bytes(bo); >+ if ((err = do_ioctl(kgem->fd, LOCAL_IOCTL_I915_GEM_MMAP, &arg))) { > assert(err != EINVAL); > > if (__kgem_throttle_retire(kgem, 0)) >@@ -536,10 +545,10 @@ retry: > return NULL; > } > >- VG(VALGRIND_MAKE_MEM_DEFINED(mmap_arg.addr_ptr, bytes(bo))); >+ VG(VALGRIND_MAKE_MEM_DEFINED(arg.addr_ptr, bytes(bo))); > > DBG(("%s: caching CPU vma for %d\n", __FUNCTION__, bo->handle)); >- return bo->map__cpu = (void *)(uintptr_t)mmap_arg.addr_ptr; >+ return bo->map__cpu = (void *)(uintptr_t)arg.addr_ptr; > } > > static int gem_write(int fd, uint32_t handle,
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 552124
:
405152
| 405170