1 files changed, 3 insertions, 8 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index ec54364ac828..7d15a774f9c9 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -693,16 +693,12 @@ nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict, bool intr,
                      struct ttm_mem_reg *new_mem)
 {
         struct drm_nouveau_private *dev_priv = nouveau_bdev(bo->bdev);
+        struct nouveau_channel *chan = chan = dev_priv->channel;
         struct nouveau_bo *nvbo = nouveau_bo(bo);
         struct ttm_mem_reg *old_mem = &bo->mem;
-        struct nouveau_channel *chan;
         int ret;
 
-        chan = nvbo->channel;
-        if (!chan) {
-                chan = dev_priv->channel;
-                mutex_lock_nested(&chan->mutex, NOUVEAU_KCHANNEL_MUTEX);
-        }
+        mutex_lock_nested(&chan->mutex, NOUVEAU_KCHANNEL_MUTEX);
 
         /* create temporary vmas for the transfer and attach them to the
          * old nouveau_mem node, these will get cleaned up after ttm has
@@ -734,8 +730,7 @@ nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict, bool intr,
         }
 
 out:
-        if (chan == dev_priv->channel)
-                mutex_unlock(&chan->mutex);
+        mutex_unlock(&chan->mutex);
         return ret;
 }