Hi Dave,
More drm-misc stuff:
- vgaswitcheroo support for apple gmux from Lukas Wunner
- checks for ->mode_fixup in non-atomic helpers from Carlos Palminha, plus
removing dummy funcs from drivers. Carlos promised to follow up with
more, since there's lots more silly dummy functions around.
- dma-buf patches from Tiago, except the ioctl itself (that needed a
respin to address review from David Herrmann)
- encoder mask for atomic from Maarten
- bunch of random things all over.
Aside: the connector_mask stuff from Maarten that landed in 4.5 is blowing
up in certain mst unplug cases. Maarten is looking into it.
Cheers, Daniel
The following changes since commit 10c1b6183a163aca59ba92b88f2b4c4cecd20d4c:
drm/tegra: drop unused variable. (2016-02-09 11:17:37 +1000)
are available in the git repository at:
git://anongit.freedesktop.org/drm-intel tags/topic/drm-misc-2016-02-12
for you to fetch changes up to 382ab95d1af85381d8a5dff09b16a80c7e492534:
drm/msm: remove unused variable (2016-02-11 11:48:39 +0100)
----------------------------------------------------------------
Arnd Bergmann (1):
drm/msm: remove unused variable
Carlos Palminha (5):
drm: fixes when i2c encoder slave mode_fixup is null.
drm: fixes crct set_mode when encoder mode_fixup is null.
drm/i2c/sil164: removed unnecessary code, mode_fixup is now optional.
drm/i2c/tda998x: removed unnecessary code, mode_fixup is now optional.
drm/bridge: removed dummy mode_fixup function from dw-hdmi.
Daniel Thompson (1):
drm: prime: Honour O_RDWR during prime-handle-to-fd
Haixia Shi (1):
drm/msm: remove the drm_device_is_unplugged check
Insu Yun (1):
ch7006: correctly handling failed allocation
LABBE Corentin (1):
drm: modes: add missing [drm] to message printing
Lukas Wunner (13):
vga_switcheroo: Add handler flags infrastructure
vga_switcheroo: Add support for switching only the DDC
apple-gmux: Track switch state
apple-gmux: Add switch_ddc support
drm/edid: Switch DDC when reading the EDID
drm/i915: Switch DDC when reading the EDID
drm/nouveau: Switch DDC when reading the EDID
drm/radeon: Switch DDC when reading the EDID
apple-gmux: Add helper for presence detect
drm/i915: Defer probe if gmux is present but its driver isn't
drm/nouveau: Defer probe if gmux is present but its driver isn't
drm/radeon: Defer probe if gmux is present but its driver isn't
apple-gmux: Fix build breakage if !CONFIG_ACPI
Maarten Lankhorst (5):
drm/core: Add drm_encoder_index.
drm/core: Add drm_for_each_encoder_mask, v2.
drm/i915: Do not touch best_encoder for load detect.
drm/atomic: Do not unset crtc when an encoder is stolen
drm/atomic: Add encoder_mask to crtc_state, v3.
Rasmus Villemoes (1):
drm/gma500: fix error path in gma_intel_setup_gmbus()
Tiago Vignatti (3):
dma-buf: Remove range-based flush
drm/i915: Implement end_cpu_access
drm/i915: Use CPU mapping for userspace dma-buf mmap()
Ville Syrjälä (1):
drm: Add drm_format_plane_width() and drm_format_plane_height()
Documentation/DocBook/gpu.tmpl | 5 +
Documentation/dma-buf-sharing.txt | 19 ++--
drivers/dma-buf/dma-buf.c | 13 +--
drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 3 +-
drivers/gpu/drm/bridge/dw-hdmi.c | 8 --
drivers/gpu/drm/drm_atomic_helper.c | 57 +++++++++--
drivers/gpu/drm/drm_crtc.c | 65 +++++++++++++
drivers/gpu/drm/drm_crtc_helper.c | 10 +-
drivers/gpu/drm/drm_edid.c | 26 +++++
drivers/gpu/drm/drm_encoder_slave.c | 3 +
drivers/gpu/drm/drm_modes.c | 3 +-
drivers/gpu/drm/drm_prime.c | 10 +-
drivers/gpu/drm/gma500/intel_gmbus.c | 2 +-
drivers/gpu/drm/i2c/ch7006_drv.c | 2 +
drivers/gpu/drm/i2c/sil164_drv.c | 9 --
drivers/gpu/drm/i2c/tda998x_drv.c | 9 --
drivers/gpu/drm/i915/i915_drv.c | 12 +++
drivers/gpu/drm/i915/i915_gem_dmabuf.c | 42 +++++++-
drivers/gpu/drm/i915/intel_display.c | 5 +-
drivers/gpu/drm/i915/intel_lvds.c | 8 +-
drivers/gpu/drm/msm/msm_fbdev.c | 4 -
drivers/gpu/drm/nouveau/nouveau_acpi.c | 2 +-
drivers/gpu/drm/nouveau/nouveau_connector.c | 21 +++-
drivers/gpu/drm/nouveau/nouveau_drm.c | 11 +++
drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 4 +-
drivers/gpu/drm/radeon/radeon_atpx_handler.c | 3 +-
drivers/gpu/drm/radeon/radeon_connectors.c | 6 ++
drivers/gpu/drm/radeon/radeon_drv.c | 11 +++
drivers/gpu/drm/udl/udl_fb.c | 2 -
drivers/gpu/vga/vga_switcheroo.c | 119 ++++++++++++++++++++++-
drivers/platform/x86/apple-gmux.c | 111 ++++++++++++++++-----
drivers/staging/android/ion/ion.c | 6 +-
drivers/staging/android/ion/ion_test.c | 4 +-
include/drm/drm_crtc.h | 18 ++++
include/drm/drm_modeset_helper_vtables.h | 2 +-
include/linux/apple-gmux.h | 50 ++++++++++
include/linux/dma-buf.h | 12 +--
include/linux/vga_switcheroo.h | 36 ++++++-
include/uapi/drm/drm.h | 1 +
39 files changed, 608 insertions(+), 126 deletions(-)
create mode 100644 include/linux/apple-gmux.h
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
