diff options
author | Dave Airlie <airlied@redhat.com> | 2017-04-21 05:51:59 +0200 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2017-04-21 05:51:59 +0200 |
commit | 6b1462700b4a6a1244c018cdd2fa97ded43090a0 (patch) | |
tree | fd6051c0334e456bf5d55c9473eb64cdb82db681 /drivers/gpu/drm/arm/malidp_planes.c | |
parent | Merge tag 'sunxi-drm-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel... (diff) | |
parent | dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro (diff) | |
download | linux-6b1462700b4a6a1244c018cdd2fa97ded43090a0.tar.xz linux-6b1462700b4a6a1244c018cdd2fa97ded43090a0.zip |
Merge tag 'drm-misc-next-fixes-2017-04-20' of git://anongit.freedesktop.org/git/drm-misc into drm-next
drm-misc-next-fixes-2017-04-20
Core changes:
- Maintain sti via drm-misc (Vincent)
- Rename dma_buf_ops->kmap_* to avoid naming collision (Logan)
Driver changes:
- Fix UHD displays on stih407 (Vincent)
- Fix uninitialized var return in atmel-hlcdc (Dan)
* tag 'drm-misc-next-fixes-2017-04-20' of git://anongit.freedesktop.org/git/drm-misc:
dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro
drm: atmel-hlcdc: Uninitialized return in atmel_hlcdc_create_outputs()
drm/sti: fix GDP size to support up to UHD resolution
MAINTAINERS: add drm/sti driver into drm-misc
Diffstat (limited to 'drivers/gpu/drm/arm/malidp_planes.c')
0 files changed, 0 insertions, 0 deletions