Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7502add2 authored by Dave Airlie's avatar Dave Airlie
Browse files

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
parents c02ed2e7 f3cd1b06

drivers/gpu/drm/etnaviv/etnaviv_gpu.c

+2 −2
Original line number Diff line number Diff line
@@ -1311,6 +1311,8 @@ int etnaviv_gpu_submit(struct etnaviv_gpu *gpu, 
		goto out_pm_put;

	}



	mutex_lock(&gpu->lock);



	fence = etnaviv_gpu_fence_alloc(gpu);

	if (!fence) {

		event_free(gpu, event);
@@ -1318,8 +1320,6 @@ int etnaviv_gpu_submit(struct etnaviv_gpu *gpu, 
		goto out_pm_put;

	}



	mutex_lock(&gpu->lock);



	gpu->event[event].fence = fence;

	submit->fence = fence->seqno;

	gpu->active_fence = submit->fence;