FAILED: patch "[PATCH] drm/i915: Fix rsvd2 mask when out-fence is returned" failed to apply to 4.16-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 4.16-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
b6a88e4a804cf5a71159906e16df2c1fc7196f92Mon Sep 17 00:00:00 2001
From: Daniele Ceraolo Spurio <[email protected]>
Date: Wed, 14 Feb 2018 11:18:25 -0800
Subject: [PATCH] drm/i915: Fix rsvd2 mask when out-fence is returned
GENMASK_ULL wants the high bit of the mask first. The current value cancels the in-fence when an out-fence is returned.
Fixes fec0445caa273 ("drm/i915: Support explicit fencing for execbuf")
Testcase: igt/gem_exec_fence/keep-in-fence*
Cc Chris Wilson <[email protected]>
Signed-off-by Daniele Ceraolo Spurio <[email protected]>
Reviewed-by Chris Wilson <[email protected]>
Signed-off-by Chris Wilson <[email protected]>
Cc <[email protected]> # v4.12+
drivers/gpu/drm/i915/i915_gem_execbuffer.c +1 -1
@@ -2410,7 +2410,7 @@ i915_gem_do_execbuffer(struct drm_device *dev,if (out_fence) {if (err ==0 ) {fd_install (out_fence_fd, out_fence->file); - args->rsvd2 &=GENMASK_ULL (0 ,31 );/* keep in-fence */ + args->rsvd2 &=GENMASK_ULL (31 ,0 );/* keep in-fence */ args->rsvd2 |= (u64 )out_fence_fd <<32 ; out_fence_fd =-1 ; }else {