1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index 8d6a783b06ba..8125bb1c745e 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -560,9 +560,6 @@ static int eb_reserve_vma(const struct i915_execbuffer *eb,
                 eb->args->flags |= __EXEC_HAS_RELOC;
         }
 
-        entry->flags |= __EXEC_OBJECT_HAS_PIN;
-        GEM_BUG_ON(eb_vma_misplaced(entry, vma));
-
         if (unlikely(entry->flags & EXEC_OBJECT_NEEDS_FENCE)) {
                 err = i915_vma_get_fence(vma);
                 if (unlikely(err)) {
@@ -574,6 +571,9 @@ static int eb_reserve_vma(const struct i915_execbuffer *eb,
                         entry->flags |= __EXEC_OBJECT_HAS_FENCE;
         }
 
+        entry->flags |= __EXEC_OBJECT_HAS_PIN;
+        GEM_BUG_ON(eb_vma_misplaced(entry, vma));
+
         return 0;
 }