Hello community, here is the log from the commit of package xf86-video-intel for openSUSE:Factory checked in at 2015-05-28 09:50:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-intel (Old) and /work/SRC/openSUSE:Factory/.xf86-video-intel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-intel" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-intel/xf86-video-intel.changes 2014-12-29 00:34:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xf86-video-intel.new/xf86-video-intel.changes 2015-05-28 09:50:45.000000000 +0200 @@ -1,0 +2,7 @@ +Tue May 26 10:17:26 UTC 2015 - [email protected] + +- U_sna-Protect-against-ABI-breakage-in-recent-versions-.patch + * sna: Protect against ABI breakage in recent versions of libdrm + (bnc#931917) + +------------------------------------------------------------------- New: ---- U_sna-Protect-against-ABI-breakage-in-recent-versions-.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-intel.spec ++++++ --- /var/tmp/diff_new_pack.WAqcMY/_old 2015-05-28 09:50:48.000000000 +0200 +++ /var/tmp/diff_new_pack.WAqcMY/_new 2015-05-28 09:50:48.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xf86-video-intel # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,6 +32,7 @@ # http://xorg.freedesktop.org/releases/individual/driver/ Source0: %{name}-%{version}.tar.bz2 Source99: baselibs.conf +Patch0: U_sna-Protect-against-ABI-breakage-in-recent-versions-.patch %if %glamor Requires: glamor @@ -102,6 +103,7 @@ %prep %setup -q +%patch0 -p1 %build ### --enable-dri3 \ ++++++ U_sna-Protect-against-ABI-breakage-in-recent-versions-.patch ++++++ >From 7fe2b2948652443ff43d907855bd7a051d54d309 Mon Sep 17 00:00:00 2001 From: Chris Wilson <[email protected]> Date: Thu, 19 Mar 2015 23:14:17 +0000 Subject: [PATCH] sna: Protect against ABI breakage in recent versions of libdrm Signed-off-by: Chris Wilson <[email protected]> --- src/sna/kgem.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) 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, -- 1.8.4.5
