diff options
| author |   Sean Paul <seanpaul@chromium.org> | 2019-05-03 15:39:37 -0400 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2019-05-03 15:39:37 -0400 |
| commit | ae677a67108726214873c02806f02ec7b470a7cf (patch) | |
| tree | bd179c7d31499bed05ed18c798c7e9f05ed83ae4 /drivers/gpu/drm/panfrost/panfrost_device.h | |
| parent | drm: prefix header search paths with $(srctree)/ (diff) | |
| parent | drm/panfrost: Prevent concurrent resets (diff) | |
| download | linux-dev-ae677a67108726214873c02806f02ec7b470a7cf.tar.xz linux-dev-ae677a67108726214873c02806f02ec7b470a7cf.zip | |
Merge panfrost-fixes into drm-misc-next-fixes
Merging some panfrost fixes as well as one rockchip fix that _just_
missed feature freeze.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/panfrost/panfrost_device.h')
| -rw-r--r-- | drivers/gpu/drm/panfrost/panfrost_device.h | 1 |
1 files changed, 1 insertions, 0 deletions
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; |