From aa20236784ab3d0372591d6eca692956bca4ebfb Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Thu, 18 Apr 2019 10:41:48 +0200 Subject: drm/panfrost: Prevent concurrent resets If a job times out in slot 0 while a reset is performed because a job timed out in slot 1, the drm-sched core can get into a deadlock. Signed-off-by: Tomeu Vizoso Signed-off-by: Rob Herring Link: https://patchwork.freedesktop.org/patch/msgid/20190418084305.45021-1-tomeu.vizoso@collabora.com --- drivers/gpu/drm/panfrost/panfrost_device.h | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers/gpu/drm/panfrost/panfrost_device.h') diff --git a/drivers/gpu/drm/panfrost/panfrost_device.h b/drivers/gpu/drm/panfrost/panfrost_device.h index 1ba48d105763..56f452dfb490 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.h +++ b/drivers/gpu/drm/panfrost/panfrost_device.h @@ -78,6 +78,7 @@ struct panfrost_device { struct list_head scheduled_jobs; struct mutex sched_lock; + struct mutex reset_lock; struct { struct devfreq *devfreq; -- cgit v1.2.3