]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'drm-etnaviv-next' of git://git.pengutronix.de/lst/linux into drm-next
authorDave Airlie <airlied@redhat.com>
Tue, 6 Dec 2016 01:00:16 +0000 (11:00 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 6 Dec 2016 01:00:16 +0000 (11:00 +1000)
- 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

1  2 
MAINTAINERS
drivers/gpu/drm/etnaviv/etnaviv_drv.c
drivers/gpu/drm/etnaviv/etnaviv_gpu.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge