diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-06-28 17:08:12 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-06-28 17:08:12 +1000 |
| commit | 8cd373707bc1903869573f577f7d39f9cee9c7ad (patch) | |
| tree | 23b9bc8257c669ce985e1918a78d45a51017398b /drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | |
| parent | 6d61e70ccc21606ffb8a0a03bd3aba24f659502b (diff) | |
| parent | 46a269da7e8a1ab6510ea5c88b2732925e5efc79 (diff) | |
| download | blackbird-op-linux-8cd373707bc1903869573f577f7d39f9cee9c7ad.tar.gz blackbird-op-linux-8cd373707bc1903869573f577f7d39f9cee9c7ad.zip | |
Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm-next
- a fix from Eric for synchronization with etnaviv exported dma-bufs
- thermal throttle support for newer GPU cores
- updated module clock gating to work around GPU errata
- a fix to restore userspace buffer cache performance
* 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux:
drm/etnaviv: restore ETNA_PREP_NOSYNC behaviour
drm/etnaviv: implement cooling support for new GPU cores
drm/etnaviv: update MLCG disables with info from newer Vivante driver
drm/etnaviv: update common.xml.h
drm/etnaviv: Expose our reservation object when exporting a dmabuf.
Diffstat (limited to 'drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c')
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c index 367bf952f61a..e5da4f2300ba 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c @@ -150,3 +150,10 @@ fail: return ERR_PTR(ret); } + +struct reservation_object *etnaviv_gem_prime_res_obj(struct drm_gem_object *obj) +{ + struct etnaviv_gem_object *etnaviv_obj = to_etnaviv_bo(obj); + + return etnaviv_obj->resv; +} |
