1
0
Fork 0
alistair23-linux/drivers/gpu/drm/rockchip
Dave Airlie 21daaeee9f Merge tag 'topic/drm-misc-2016-05-04' of git://anongit.freedesktop.org/drm-intel into drm-next
Ofc I promise just a few leftovers for drm-misc and somehow it's the
biggest pull. But really mostly trivial stuff:
- MAINTAINERS updates from Emil
- rename async to nonblock in atomic_commit to avoid the confusion between
  nonblocking ioctl and async flip (= not vblank synced), from Maarten.
  Needs to be regened with newer drivers, but probably only after -rc1 to
  catch them all.
- actually lockless gem_object_free, plus acked driver conversion patches.
  All the trickier prep stuff already is in drm-next.
- Noralf's nice work for generic defio support in our fbdev emulation.
  Keeps the udl hack, and qxl is tested by Gerd.

* tag 'topic/drm-misc-2016-05-04' of git://anongit.freedesktop.org/drm-intel: (47 commits)
  drm: Fixup locking WARN_ON mistake around gem_object_free_unlocked
  drm/etnaviv: Use lockless gem BO free callback
  drm/imx: Use lockless gem BO free callback
  drm/radeon: Use lockless gem BO free callback
  drm/amdgpu: Use lockless gem BO free callback
  drm/gem: support BO freeing without dev->struct_mutex
  MAINTAINERS: Add myself for the new VC4 (RPi GPU) graphics driver.
  MAINTAINERS: Add a bunch of legacy (UMS) DRM drivers
  MAINTAINERS: Add a few DRM drivers by Dave Airlie
  MAINTAINERS: List the correct git repo for the Renesas DRM drivers
  MAINTAINERS: Update the files list for the Renesas DRM drivers
  MAINTAINERS: Update the files list for the Armada DRM driver
  MAINTAINERS: Update the files list for the Rockchip DRM driver
  MAINTAINERS: Update the files list for the Exynos DRM driver
  MAINTAINERS: Add maintainer entry for the VMWGFX DRM driver
  MAINTAINERS: Add maintainer entry for the MSM DRM driver
  MAINTAINERS: Add maintainer entry for the Nouveau DRM driver
  MAINTAINERS: Update the files list for the Etnaviv DRM driver
  MAINTAINERS: Remove unneded wildcard for the i915 DRM driver
  drm/atomic: Add WARN_ON when state->acquire_ctx is not set.
  ...
2016-05-05 09:56:30 +10:00
..
Kconfig drm: rockchip: dp: add rockchip platform dp driver 2016-04-05 10:13:04 +08:00
Makefile drm: rockchip: dp: add rockchip platform dp driver 2016-04-05 10:13:04 +08:00
analogix_dp-rockchip.c drm/rockchip: get rid of rockchip_drm_crtc_mode_config 2016-05-03 14:11:23 +08:00
dw-mipi-dsi.c drm/rockchip: get rid of rockchip_drm_crtc_mode_config 2016-05-03 14:11:23 +08:00
dw_hdmi-rockchip.c drm/rockchip: get rid of rockchip_drm_crtc_mode_config 2016-05-03 14:11:23 +08:00
inno_hdmi.c drm/rockchip: get rid of rockchip_drm_crtc_mode_config 2016-05-03 14:11:23 +08:00
inno_hdmi.h drm/rockchip: hdmi: add Innosilicon HDMI support 2016-02-18 13:56:43 +08:00
rockchip_drm_drv.c drm/rockchip: support non-iommu buffer path 2016-05-03 14:11:23 +08:00
rockchip_drm_drv.h drm/rockchip: get rid of rockchip_drm_crtc_mode_config 2016-05-03 14:11:23 +08:00
rockchip_drm_fb.c drm/rockchip: Rename async to nonblock. 2016-05-02 16:38:12 +02:00
rockchip_drm_fb.h drm: Pass the user drm_mode_fb_cmd2 as const to .fb_create() 2015-11-24 11:47:38 +01:00
rockchip_drm_fbdev.c drm/rockchip: Use new drm_fb_helper functions 2015-08-06 14:12:56 +02:00
rockchip_drm_fbdev.h drm/rockchip: respect CONFIG_DRM_FBDEV_EMULATION 2016-01-22 08:45:31 +08:00
rockchip_drm_gem.c drm/rockchip: fix wrong pitch/size using on gem 2016-01-21 09:14:05 +08:00
rockchip_drm_gem.h drm/rockchip: Only alloc a kmap for fbdev gem object 2015-03-16 10:07:12 +08:00
rockchip_drm_vop.c drm/rockchip: vop: Initialize vskiplines to zero 2016-05-03 14:11:23 +08:00
rockchip_drm_vop.h drm/rockchip: vop: spilt scale regsters 2015-12-28 09:01:41 +08:00
rockchip_vop_reg.c drm/rockchip: vop: add rk3036 vop support 2015-12-28 09:01:48 +08:00
rockchip_vop_reg.h drm/rockchip: vop: add rk3036 vop support 2015-12-28 09:01:48 +08:00