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_prime.c | |
| parent | Merge tag 'amd-drm-next-5.14-2021-06-09' of https://gitlab.freedesktop.org/agd5f/linux into drm-next (diff) | |
| parent | drm/etnaviv: add HWDB entry for GC7000 rev 6204 (diff) | |
| download | linux-dev-0666cba1f5b2bfbf17aab9fb7b0dbbb597213441.tar.xz linux-dev-0666cba1f5b2bfbf17aab9fb7b0dbbb597213441.zip | |
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_prime.c')
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c index b390dd4d60b7..d741b1d735f7 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c @@ -80,8 +80,7 @@ static void etnaviv_gem_prime_release(struct etnaviv_gem_object *etnaviv_obj) /* Don't drop the pages for imported dmabuf, as they are not * ours, just free the array we allocated: */ - if (etnaviv_obj->pages) - kvfree(etnaviv_obj->pages); + kvfree(etnaviv_obj->pages); drm_prime_gem_destroy(&etnaviv_obj->base, etnaviv_obj->sgt); } |