| From 7fe2b2948652443ff43d907855bd7a051d54d309 Mon Sep 17 00:00:00 2001 |
| From: Chris Wilson <chris@chris-wilson.co.uk> |
| Date: Thu, 19 Mar 2015 23:14:17 +0000 |
| Subject: [PATCH] sna: Protect against ABI breakage in recent versions of |
| libdrm |
| |
| commit 7fe2b2948652443ff43d907855bd7a051d54d309 upstream. |
| |
| Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> |
| Upstream-Status: Backport |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/src/sna/kgem.c b/src/sna/kgem.c |
| index 11f0828f2bbc..6f16cbac87f2 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, |
| -- |
| 2.4.4 |
| |