Преглед на файлове

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>
Tom St Denis преди 7 години
родител
ревизия
07d48da4f4
променени са 1 файла, в които са добавени 8 реда и са изтрити 6 реда
  1. 8 6
      drivers/gpu/drm/ttm/ttm_execbuf_util.c

+ 8 - 6
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);
 		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)
 		if (!ret && entry->shared)