diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-06-11 12:50:47 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-06-11 13:00:58 +1000 |
| commit | 0666cba1f5b2bfbf17aab9fb7b0dbbb597213441 (patch) | |
| tree | 734cb4dae214bbea2df3fff3b552ed8b476bf76d /drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | |
| parent | c707b73f0cfb1acc94a20389aecde65e6385349b (diff) | |
| parent | 989c9dad613155a60f15747e3f1db210a6304ecf (diff) | |
| download | linux-0666cba1f5b2bfbf17aab9fb7b0dbbb597213441.tar.gz linux-0666cba1f5b2bfbf17aab9fb7b0dbbb597213441.tar.xz | |
Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm-next
- remove redundant NULL checks by various people
- fix sparse checker warnings from Marc
- expose more GPU ID values to userspace from Christian
- add HWDB entry for GPU found on i.MX8MP from Sascha
- rework of the linear window calculation to better deal with
systems with large regions of reserved RAM
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Lucas Stach <l.stach@pengutronix.de>
Link: https://patchwork.freedesktop.org/patch/msgid/f27e1ec2c2fea310bfb6fe6c99174a54e9dfba83.camel@pengutronix.de
Diffstat (limited to 'drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c')
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c index d53856d7a747..4dd7d9d541c0 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c @@ -612,14 +612,10 @@ err_submit_ww_acquire: err_submit_cmds: if (ret && (out_fence_fd >= 0)) put_unused_fd(out_fence_fd); - if (stream) - kvfree(stream); - if (bos) - kvfree(bos); - if (relocs) - kvfree(relocs); - if (pmrs) - kvfree(pmrs); + kvfree(stream); + kvfree(bos); + kvfree(relocs); + kvfree(pmrs); return ret; } |