diff options
author | Dave Airlie <airlied@redhat.com> | 2019-05-16 10:19:29 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2019-05-16 10:19:33 +1000 |
commit | 8da0e1525b7f0d69c6cb44094963906282b32673 (patch) | |
tree | afdcf9ae748c4785ed54884f2507c09fc4b5b961 /drivers/gpu/drm/panfrost/panfrost_drv.c | |
parent | dc28d5742b2b535c6858344f798835729a9f2a46 (diff) | |
parent | 2b117451277140b782f3e4e56a4296c0a165e7ae (diff) | |
download | linux-8da0e1525b7f0d69c6cb44094963906282b32673.tar.bz2 |
Merge tag 'drm-misc-next-fixes-2019-05-15' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
- A couple new panfrost fixes
- Fix the low refresh rate register in adv7511
- A handful of msm fixes that fell out of 5.1 bringup on SDM845
- Fix spinlock initialization in pl111
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20190515201729.GA89093@art_vandelay
Diffstat (limited to 'drivers/gpu/drm/panfrost/panfrost_drv.c')
-rw-r--r-- | drivers/gpu/drm/panfrost/panfrost_drv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c index 94b0819ad50b..d11e2281dde6 100644 --- a/drivers/gpu/drm/panfrost/panfrost_drv.c +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c @@ -219,7 +219,8 @@ static int panfrost_ioctl_submit(struct drm_device *dev, void *data, fail_job: panfrost_job_put(job); fail_out_sync: - drm_syncobj_put(sync_out); + if (sync_out) + drm_syncobj_put(sync_out); return ret; } |