diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-11-01 04:09:42 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-11-01 04:10:08 +0300 |
| commit | ec26530c8cb897858a9c440a9e006dcd7efafcdc (patch) | |
| tree | 9ac77b589cda6dbb607b97eabb85c81dfcaeb715 /drivers/gpu/drm/v3d/v3d_gem.c | |
| parent | 6f966213fea0adf91684074e37177d2d61228137 (diff) | |
| parent | f70744c68779c8a72a0c82294e3233b994af656d (diff) | |
| download | linux-ec26530c8cb897858a9c440a9e006dcd7efafcdc.tar.xz | |
Merge tag 'drm-misc-fixes-2019-10-30-1' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
- three fixes for panfrost, one to silence a warning, one to fix
runtime_pm and one to prevent bogus pointer dereferences
- one fix for a memleak in v3d
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <mripard@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20191030182207.evrscl7lnv42u5zu@hendrix
Diffstat (limited to 'drivers/gpu/drm/v3d/v3d_gem.c')
| -rw-r--r-- | drivers/gpu/drm/v3d/v3d_gem.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c index 5d80507b539b..19c092d75266 100644 --- a/drivers/gpu/drm/v3d/v3d_gem.c +++ b/drivers/gpu/drm/v3d/v3d_gem.c @@ -557,13 +557,16 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data, if (args->bcl_start != args->bcl_end) { bin = kcalloc(1, sizeof(*bin), GFP_KERNEL); - if (!bin) + if (!bin) { + v3d_job_put(&render->base); return -ENOMEM; + } ret = v3d_job_init(v3d, file_priv, &bin->base, v3d_job_free, args->in_sync_bcl); if (ret) { v3d_job_put(&render->base); + kfree(bin); return ret; } |