Merge branch 'drm-etnaviv-next' of git://git.pengutronix.de/lst/linux into drm-next

Browse source

- 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

...

This commit is contained in:

Dave Airlie 2016-12-06 11:00:16 +10:00

parent 9ac63d9973 c4ae94a36c

commit 770ac20413

8 changed files with 84 additions and 7 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

MAINTAINERS

View file

58

drivers/gpu/drm/etnaviv/cmdstream.xml.h

View file

1

drivers/gpu/drm/etnaviv/etnaviv_cmd_parser.c

View file

1

drivers/gpu/drm/etnaviv/etnaviv_drv.c

View file

2

drivers/gpu/drm/etnaviv/etnaviv_drv.h

View file

3

drivers/gpu/drm/etnaviv/etnaviv_dump.c

View file

19

drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c

View file

4

drivers/gpu/drm/etnaviv/etnaviv_gpu.c

View file