drm/ttm: Simplify ttm_eu_reserve_buffers()

Hoist the comparison of the ret to -EDEADLK above
the two code paths to simplify the function.

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/ttm/ttm_execbuf_util.c b/drivers/gpu/drm/ttm/ttm_execbuf_util.c
index 373ced0b2fc246ce4f1ebd8164f51660fe6d0bc2..fa44f7b152859ae8e001204163ff0de9883a8200 100644 (file)
--- a/drivers/gpu/drm/ttm/ttm_execbuf_util.c
+++ b/drivers/gpu/drm/ttm/ttm_execbuf_util.c
@@ -139,12 +139,14 @@ int ttm_eu_reserve_buffers(struct ww_acquire_ctx *ticket,
                 */
                ttm_eu_backoff_reservation_reverse(list, entry);
 
-               if (ret == -EDEADLK && intr) {
-                       ret = ww_mutex_lock_slow_interruptible(&bo->resv->lock,
-                                                              ticket);
-               } else if (ret == -EDEADLK) {
-                       ww_mutex_lock_slow(&bo->resv->lock, ticket);
-                       ret = 0;
+               if (ret == -EDEADLK) {
+                       if (intr) {
+                               ret = ww_mutex_lock_slow_interruptible(&bo->resv->lock,
+                                                                      ticket);
+                       } else {
+                               ww_mutex_lock_slow(&bo->resv->lock, ticket);
+                               ret = 0;
+                       }
                }
 
                if (!ret && entry->shared)