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

Commit 979ee290 authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

drm/nouveau: increase reservation sequence every retry 



This is temporary until the fence framework can be used. With the
lru/reservation atomicity removal it is possible to see your old
sequence number and the buffer being reserved, leading to erroneously
reporting -EDEADLK.

Workaround it by bumping the sequence number every retry.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@canonical.com>
parent 42f6e3da

drivers/gpu/drm/nouveau/nouveau_gem.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -321,8 +321,8 @@ validate_init(struct nouveau_channel *chan, struct drm_file *file_priv, 
	int trycnt = 0;

	int trycnt = 0;

	int ret, i;

	int ret, i;





	sequence = atomic_add_return(1, &drm->ttm.validate_sequence);

retry:

retry:

	sequence = atomic_add_return(1, &drm->ttm.validate_sequence);

	if (++trycnt > 100000) {

	if (++trycnt > 100000) {

		NV_ERROR(drm, "%s failed and gave up.\n", __func__);

		NV_ERROR(drm, "%s failed and gave up.\n", __func__);

		return -EINVAL;

		return -EINVAL;