Patch "drm/i915: Fix rsvd2 mask when out-fence is returned" has been added to the 4.15-stable tree

This is a note to let you know that I've just added the patch titled

drm/i915: Fix rsvd2 mask when out-fence is returned

to the 4.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
drm-i915-fix-rsvd2-mask-when-out-fence-is-returned.patch
and it can be found in the queue-4.15 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Daniele Ceraolo Spurio <[email protected]>
Date: Wed, 14 Feb 2018 11:18:25 -0800
Subject: drm/i915: Fix rsvd2 mask when out-fence is returned

From: Daniele Ceraolo Spurio <[email protected]>

commit b1b13780ab06ef8c770dd9cbe31dac549a11630e upstream.

GENMASK_ULL wants the high bit of the mask first. The current value cancels the in-fence when an out-fence is returned.

Testcase: igt/gem_exec_fence/keep-in-fence*

---
 drivers/gpu/drm/i915/i915_gem_execbuffer.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

@@ -2419,7 +2419,7 @@ err_request:
 	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 {

Patches currently in stable-queue which might be from [email protected] are

queue-4.15/drm-i915-fix-rsvd2-mask-when-out-fence-is-returned.patch