diff options
| author | Sean Paul <seanpaul@chromium.org> | 2019-05-03 22:39:37 +0300 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2019-05-03 22:39:37 +0300 |
| commit | ae677a67108726214873c02806f02ec7b470a7cf (patch) | |
| tree | bd179c7d31499bed05ed18c798c7e9f05ed83ae4 /drivers/gpu/drm/panfrost/panfrost_device.c | |
| parent | 43068cb7ba1f6ceb1523e947c84002b2a61fd6d4 (diff) | |
| parent | aa20236784ab3d0372591d6eca692956bca4ebfb (diff) | |
| download | linux-ae677a67108726214873c02806f02ec7b470a7cf.tar.xz | |
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.c')
| -rw-r--r-- | drivers/gpu/drm/panfrost/panfrost_device.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/panfrost/panfrost_device.c index 91e8fb0f2b25..970f669c6d29 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.c +++ b/drivers/gpu/drm/panfrost/panfrost_device.c @@ -98,6 +98,7 @@ int panfrost_device_init(struct panfrost_device *pfdev) struct resource *res; mutex_init(&pfdev->sched_lock); + mutex_init(&pfdev->reset_lock); INIT_LIST_HEAD(&pfdev->scheduled_jobs); spin_lock_init(&pfdev->hwaccess_lock); |