Skip to contentSkip to conversation

topic/drm-misc

GIT PULL Daniel Vetter 1 participant 1 message May 4, 2016

lore
Share & tools
lore
#0 lore raw

Hi Dave,

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.

The other bit pending from Noralf is the drm_simple_output helper, that still needs a tiny bit of polish. Guess 4.8 for that probably.

Cheers, Daniel

The following changes since commit be35f94f5c83bfed9ded918162c9b622743ef520:

drm/atomic: Add missing drm_crtc_internal.h include (2016-04-28 16:36:30 +0200)

are available in the git repository at:

git://anongit.freedesktop.org/drm-intel tags/topic/drm-misc-2016-05-04

for you to fetch changes up to 6d3e7fddb39a4f0a47c8042df11554bb61d7a4aa:

drm: Fixup locking WARN_ON mistake around gem_object_free_unlocked (2016-05-04 15:24:32 +0200)

----------------------------------------------------------------
Arnd Bergmann (1):
drm/fsl-dcu: add COMMON_CLK dependency

Daniel Vetter (6):
drm/gem: support BO freeing without dev->struct_mutex drm/amdgpu: Use lockless gem BO free callback drm/radeon: Use lockless gem BO free callback
drm/imx: Use lockless gem BO free callback drm/etnaviv: Use lockless gem BO free callback
drm: Fixup locking WARN_ON mistake around gem_object_free_unlocked

Emil Velikov (12):
MAINTAINERS: Remove unneded wildcard for the i915 DRM driver
MAINTAINERS: Update the files list for the Etnaviv DRM driver
MAINTAINERS: Add maintainer entry for the Nouveau DRM driver
MAINTAINERS: Add maintainer entry for the MSM DRM driver
MAINTAINERS: Add maintainer entry for the VMWGFX DRM driver
MAINTAINERS: Update the files list for the Exynos DRM driver
MAINTAINERS: Update the files list for the Rockchip DRM driver
MAINTAINERS: Update the files list for the Armada DRM driver
MAINTAINERS: Update the files list for the Renesas DRM drivers
MAINTAINERS: List the correct git repo for the Renesas DRM drivers
MAINTAINERS: Add a few DRM drivers by Dave Airlie
MAINTAINERS: Add a bunch of legacy (UMS) DRM drivers

Eric Anholt (1):
MAINTAINERS: Add myself for the new VC4 (RPi GPU) graphics driver.

Gustavo Padovan (6):
drm/amdgpu: use drm_crtc_send_vblank_event() drm/radeon: use drm_crtc_send_vblank_event() drm/msm: use drm_crtc_send_vblank_event() drm/rcar-du: use drm_crtc_send_vblank_event() drm/shmobile: use drm_crtc_send_vblank_event() drm/tilcdc: use drm_crtc_send_vblank_event()

Maarten Lankhorst (13):
drm/atomic: Rename async parameter to nonblocking. drm/atomic: Rename drm_atomic_async_commit to nonblocking. drm/arm/hdlcd: Rename async to nonblock. drm/exynos: Rename async to nonblock.
drm/msm: Rename async to nonblock.
drm/omapdrm: Rename async to nonblock. drm/rcar-du: Rename async to nonblock.
drm/sti: Rename async to nonblock.
drm/tegra: Rename async to nonblock. drm/rockchip: Rename async to nonblock.
drm/vc4: Rename async to nonblock.
drm/i915: Rename async to nonblock.
drm/atomic: Add WARN_ON when state->acquire_ctx is not set.

Noralf Trønnes (7):
drm/udl: Change drm_fb_helper_sys_*() calls to sys_*() drm/qxl: Change drm_fb_helper_sys_*() calls to sys_*() drm/fb-helper: Add fb_deferred_io support
fbdev: fb_defio: Export fb_deferred_io_mmap drm/fb-cma-helper: Add fb_deferred_io support drm/qxl: Use drm_fb_helper deferred_io support drm/udl: Use drm_fb_helper deferred_io support

Robert Foss (1):
drm/docs: Move "scaling mode" property.

 Documentation/DocBook/gpu.tmpl             |  22 ++-
 MAINTAINERS                                | 117 ++++++++++++++-
 drivers/gpu/drm/Kconfig                    |   1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c    |   2 +-
 drivers/gpu/drm/amd/amdgpu/dce_v10_0.c     |   2 +-
 drivers/gpu/drm/amd/amdgpu/dce_v11_0.c     |   2 +-
 drivers/gpu/drm/amd/amdgpu/dce_v8_0.c      |   2 +-
 drivers/gpu/drm/arm/hdlcd_drv.c            |   2 +-
 drivers/gpu/drm/drm_atomic.c               |  18 ++-
 drivers/gpu/drm/drm_atomic_helper.c        |  34 ++---
 drivers/gpu/drm/drm_fb_cma_helper.c        | 178 +++++++++++++++++++++--
 drivers/gpu/drm/drm_fb_helper.c            | 103 ++++++++++++-
 drivers/gpu/drm/drm_gem.c                  |  57 +++++++-
 drivers/gpu/drm/etnaviv/etnaviv_drv.c      |   2 +-
 drivers/gpu/drm/exynos/exynos_drm_drv.c    |   4 +-
 drivers/gpu/drm/exynos/exynos_drm_drv.h    |   2 +-
 drivers/gpu/drm/fsl-dcu/Kconfig            |   2 +-
 drivers/gpu/drm/i915/intel_display.c       |  16 +--
 drivers/gpu/drm/imx/imx-drm-core.c         |   2 +-
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c   |   2 +-
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c   |   2 +-
 drivers/gpu/drm/msm/msm_atomic.c           |   9 +-
 drivers/gpu/drm/msm/msm_drv.h              |   2 +-
 drivers/gpu/drm/omapdrm/omap_drv.c         |   4 +-
 drivers/gpu/drm/qxl/qxl_display.c          |   9 +-
 drivers/gpu/drm/qxl/qxl_drv.h              |   7 +-
 drivers/gpu/drm/qxl/qxl_fb.c               | 223 ++++++++---------------------
 drivers/gpu/drm/qxl/qxl_kms.c              |   4 -
 drivers/gpu/drm/radeon/radeon_display.c    |   2 +-
 drivers/gpu/drm/radeon/radeon_drv.c        |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_crtc.c     |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_kms.c      |   5 +-
 drivers/gpu/drm/rockchip/rockchip_drm_fb.c |   6 +-
 drivers/gpu/drm/shmobile/shmob_drm_crtc.c  |   2 +-
 drivers/gpu/drm/sti/sti_drv.c              |   6 +-
 drivers/gpu/drm/tegra/drm.c                |   6 +-
 drivers/gpu/drm/tilcdc/tilcdc_crtc.c       |   2 +-
 drivers/gpu/drm/udl/udl_drv.h              |   2 -
 drivers/gpu/drm/udl/udl_fb.c               | 140 +-----------------
 drivers/gpu/drm/vc4/vc4_kms.c              |   6 +-
 drivers/video/fbdev/core/fb_defio.c        |   3 +-
 include/drm/drmP.h                         |  15 +-
 include/drm/drm_atomic.h                   |   2 +-
 include/drm/drm_atomic_helper.h            |   2 +-
 include/drm/drm_crtc.h                     |   8 +-
 include/drm/drm_fb_cma_helper.h            |  14 ++
 include/drm/drm_fb_helper.h                |  15 ++
 include/drm/drm_gem.h                      |  48 ++-----
 include/linux/fb.h                         |   1 +
 49 files changed, 657 insertions(+), 462 deletions(-)
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx