Merge branch 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next

Browse source

This pull request adds an anon file for exynos specific mmaper
to resolve potential a dead lock issue pointed out by Al Viro,
and fixes build break of drm-next.

* 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos:
  drm/exynos: fix build error caused by removed drm core macros
  drm/exynos: use a new anon file for exynos gem mmaper

...

This commit is contained in:

Dave Airlie 2014-01-13 13:55:48 +10:00

parent e95d9f9550 8dd9ad5d3b

commit ca2a2bb13e

5 changed files with 40 additions and 63 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

21

drivers/gpu/drm/exynos/exynos_drm_drv.c

View file

1

drivers/gpu/drm/exynos/exynos_drm_drv.h

View file

4

drivers/gpu/drm/exynos/exynos_drm_fimd.c

View file

74

drivers/gpu/drm/exynos/exynos_drm_gem.c

View file

3

drivers/gpu/drm/exynos/exynos_drm_gem.h

View file