diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-12-06 04:00:16 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-12-06 04:00:16 +0300 |
| commit | 770ac20413ce654f6e4efaaf24e954ebb907fc3b (patch) | |
| tree | d4eb8e5a8ffcdf9aa4b46ee6b281a033c5e34393 /drivers/gpu/drm/etnaviv/etnaviv_drv.c | |
| parent | 9ac63d99732ad221ad2606e7910ed4bec4763d84 (diff) | |
| parent | c4ae94a36c76a901149b24d297f7b9c7aad3eb89 (diff) | |
| download | linux-770ac20413ce654f6e4efaaf24e954ebb907fc3b.tar.xz | |
Merge branch 'drm-etnaviv-next' of git://git.pengutronix.de/lst/linux into drm-next
- fix dma-buf export path to return correct SG table
- trivially implement direct dma-buf mapping
- allow DRAW_INSTANCED commands in validator
- make the driver work on i.MX6SX, yielding a working 2D/3D stack
together with Mareks MXS DRM driver
* 'drm-etnaviv-next' of git://git.pengutronix.de/lst/linux:
MAINTAINERS: add etnaviv mailinglist
drm/etnaviv: move linear window on MC1.0 parts if necessary
drm/etnaviv: don't invoke OOM killer from dump code
drm/etnaviv: fix gem_prime_get_sg_table to return new SG table
drm/etnaviv: Allow DRAW_INSTANCED commands
drm/etnaviv: implement dma-buf mmap
Diffstat (limited to 'drivers/gpu/drm/etnaviv/etnaviv_drv.c')
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_drv.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c index a6799b0aa3d9..00368b14d08d 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c @@ -504,6 +504,7 @@ static struct drm_driver etnaviv_drm_driver = { .gem_prime_import_sg_table = etnaviv_gem_prime_import_sg_table, .gem_prime_vmap = etnaviv_gem_prime_vmap, .gem_prime_vunmap = etnaviv_gem_prime_vunmap, + .gem_prime_mmap = etnaviv_gem_prime_mmap, #ifdef CONFIG_DEBUG_FS .debugfs_init = etnaviv_debugfs_init, .debugfs_cleanup = etnaviv_debugfs_cleanup, |