Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sna: Userptr lands upstream, enable. 

No longer an optional feature of an experimental kernel!

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2014-05-16 18:20:06 +01:00
parent 89e8f2b35b
commit df297e9faf
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.ac
View File

@ -640,17 +640,6 @@ if test "x$ROTATION" = "xyes"; then
xp_msg="$xp_msg rotation"
fi
AC_ARG_ENABLE(userptr,
AS_HELP_STRING([--enable-userptr],
[Enable use of userptr (experimental) [default=no]]),
[USERPTR="$enableval"],
[USERPTR="no"])
AM_CONDITIONAL(USE_USERPTR, test "x$USERPTR" = "xyes")
if test "x$USERPTR" = "xyes"; then
AC_DEFINE(USE_USERPTR,1,[Assume "userptr" support])
xp_msg="$xp_msg userptr"
fi
AC_ARG_ENABLE(async-swap,
AS_HELP_STRING([--enable-async-swap],
[Enable use of asynchronous swaps (experimental) [default=no]]),

8
src/sna/kgem.c
View File

@ -133,7 +133,7 @@ search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags);
#define LOCAL_I915_EXEC_NO_RELOC (1<<11)
#define LOCAL_I915_EXEC_HANDLE_LUT (1<<12)
#define LOCAL_I915_GEM_CREATE2 0x33
#define LOCAL_I915_GEM_CREATE2 0x34
#define LOCAL_IOCTL_I915_GEM_CREATE2 DRM_IOWR (DRM_COMMAND_BASE + LOCAL_I915_GEM_CREATE2, struct local_i915_gem_create2)
struct local_i915_gem_create2 {
uint64_t size;
@ -149,7 +149,7 @@ struct local_i915_gem_create2 {
uint32_t handle;
};
#define LOCAL_I915_GEM_USERPTR 0x34
#define LOCAL_I915_GEM_USERPTR 0x33
#define LOCAL_IOCTL_I915_GEM_USERPTR DRM_IOWR (DRM_COMMAND_BASE + LOCAL_I915_GEM_USERPTR, struct local_i915_gem_userptr)
struct local_i915_gem_userptr {
uint64_t user_ptr;
@ -1034,7 +1034,6 @@ static bool test_has_caching(struct kgem *kgem)
static bool test_has_userptr(struct kgem *kgem)
{
#if defined(USE_USERPTR)
uint32_t handle;
void *ptr;
@ -1053,9 +1052,6 @@ static bool test_has_userptr(struct kgem *kgem)
free(ptr);
return handle != 0;
#else
return false;
#endif
}
static bool test_has_create2(struct kgem *kgem)