diff options
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_execbuffer.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_execbuffer.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index 4401068ff468..3ab1ace2a6bd 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c | |||
| @@ -505,6 +505,8 @@ eb_add_vma(struct i915_execbuffer *eb, unsigned int i, struct i915_vma *vma) | |||
| 505 | list_add_tail(&vma->exec_link, &eb->unbound); | 505 | list_add_tail(&vma->exec_link, &eb->unbound); |
| 506 | if (drm_mm_node_allocated(&vma->node)) | 506 | if (drm_mm_node_allocated(&vma->node)) |
| 507 | err = i915_vma_unbind(vma); | 507 | err = i915_vma_unbind(vma); |
| 508 | if (unlikely(err)) | ||
| 509 | vma->exec_flags = NULL; | ||
| 508 | } | 510 | } |
| 509 | return err; | 511 | return err; |
| 510 | } | 512 | } |
| @@ -2410,7 +2412,7 @@ err_request: | |||
| 2410 | if (out_fence) { | 2412 | if (out_fence) { |
| 2411 | if (err == 0) { | 2413 | if (err == 0) { |
| 2412 | fd_install(out_fence_fd, out_fence->file); | 2414 | fd_install(out_fence_fd, out_fence->file); |
| 2413 | args->rsvd2 &= GENMASK_ULL(0, 31); /* keep in-fence */ | 2415 | args->rsvd2 &= GENMASK_ULL(31, 0); /* keep in-fence */ |
| 2414 | args->rsvd2 |= (u64)out_fence_fd << 32; | 2416 | args->rsvd2 |= (u64)out_fence_fd << 32; |
| 2415 | out_fence_fd = -1; | 2417 | out_fence_fd = -1; |
| 2416 | } else { | 2418 | } else { |