Commit e57c1a3b authored by Yongzhi Liu's avatar Yongzhi Liu Committed by Melissa Wen
Browse files

drm/v3d: fix missing unlock 



[why]
Unlock is needed on the error handling path to prevent dead lock.
v3d_submit_cl_ioctl and v3d_submit_csd_ioctl is missing unlock.

[how]
Fix this by changing goto target on the error handling path. So
changing the goto to target an error handling path
that includes drm_gem_unlock reservations.

Signed-off-by: default avatarYongzhi Liu <lyz_cs@pku.edu.cn>
Reviewed-by: default avatarMelissa Wen <mwen@igalia.com>
Signed-off-by: default avatarMelissa Wen <melissa.srw@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1643377262-109975-1-git-send-email-lyz_cs@pku.edu.cn
parent d80976d9

drivers/gpu/drm/v3d/v3d_gem.c

+4 −2
Original line number Diff line number Diff line
@@ -798,7 +798,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data, 


		if (!render->base.perfmon) {

			ret = -ENOENT;

			goto fail;

			goto fail_perfmon;

		}

	}
@@ -847,6 +847,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data, 


fail_unreserve:

	mutex_unlock(&v3d->sched_lock);

fail_perfmon:

	drm_gem_unlock_reservations(last_job->bo,

				    last_job->bo_count, &acquire_ctx);

fail:
@@ -1027,7 +1028,7 @@ v3d_submit_csd_ioctl(struct drm_device *dev, void *data, 
						     args->perfmon_id);

		if (!job->base.perfmon) {

			ret = -ENOENT;

			goto fail;

			goto fail_perfmon;

		}

	}
@@ -1056,6 +1057,7 @@ v3d_submit_csd_ioctl(struct drm_device *dev, void *data, 


fail_unreserve:

	mutex_unlock(&v3d->sched_lock);

fail_perfmon:

	drm_gem_unlock_reservations(clean_job->bo, clean_job->bo_count,

				    &acquire_ctx);

fail: