Эх сурвалжийг харах

Merge branch 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux into drm-fixes

a single fix to keep fence seqnos of completed jobs monotonically
increasing, as expected in various locations of the driver code. Also
tagged for stable.

* 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux:
  drm/etnaviv: (re-)protect fence allocation with GPU mutex
Dave Airlie 8 жил өмнө
parent
commit
7502add221

+ 2 - 2
drivers/gpu/drm/etnaviv/etnaviv_gpu.c

@@ -1311,6 +1311,8 @@ int etnaviv_gpu_submit(struct etnaviv_gpu *gpu,
 		goto out_pm_put;
 		goto out_pm_put;
 	}
 	}
 
 
+	mutex_lock(&gpu->lock);
+
 	fence = etnaviv_gpu_fence_alloc(gpu);
 	fence = etnaviv_gpu_fence_alloc(gpu);
 	if (!fence) {
 	if (!fence) {
 		event_free(gpu, event);
 		event_free(gpu, event);
@@ -1318,8 +1320,6 @@ int etnaviv_gpu_submit(struct etnaviv_gpu *gpu,
 		goto out_pm_put;
 		goto out_pm_put;
 	}
 	}
 
 
-	mutex_lock(&gpu->lock);
-
 	gpu->event[event].fence = fence;
 	gpu->event[event].fence = fence;
 	submit->fence = fence->seqno;
 	submit->fence = fence->seqno;
 	gpu->active_fence = submit->fence;
 	gpu->active_fence = submit->fence;