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

Commit aae2d1fc authored by Dave Airlie's avatar Dave Airlie
Browse files

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

Single GPU recovery fix
* 'drm-etnaviv-fixes' of git://git.pengutronix.de/git/lst/linux:
  drm/etnaviv: take GPU lock later in the submit process
parents 91d62d9f d9853490

drivers/gpu/drm/etnaviv/etnaviv_gpu.c

+5 −5
Original line number Diff line number Diff line
@@ -1333,8 +1333,6 @@ int etnaviv_gpu_submit(struct etnaviv_gpu *gpu, 
	if (ret < 0)

		return ret;



	mutex_lock(&gpu->lock);



	/*

	 * TODO

	 *
@@ -1348,16 +1346,18 @@ int etnaviv_gpu_submit(struct etnaviv_gpu *gpu, 
	if (unlikely(event == ~0U)) {

		DRM_ERROR("no free event\n");

		ret = -EBUSY;

		goto out_unlock;

		goto out_pm_put;

	}



	fence = etnaviv_gpu_fence_alloc(gpu);

	if (!fence) {

		event_free(gpu, event);

		ret = -ENOMEM;

		goto out_unlock;

		goto out_pm_put;

	}



	mutex_lock(&gpu->lock);



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

	submit->fence = fence->seqno;

	gpu->active_fence = submit->fence;
@@ -1395,9 +1395,9 @@ int etnaviv_gpu_submit(struct etnaviv_gpu *gpu, 
	hangcheck_timer_reset(gpu);

	ret = 0;



out_unlock:

	mutex_unlock(&gpu->lock);



out_pm_put:

	etnaviv_gpu_pm_put(gpu);



	return ret;