[Intel-gfx] [PULL] topic/drm-misc

Daniel Vetter daniel.vetter at ffwll.ch
Thu Feb 18 19:51:53 UTC 2016


Hi Dave,

Misc stuff all over:
- more mode_fixup removal from Carlos, there's another final pile still
  left.
- final bits of vgaswitcheroo from Lukas for apple gmux, we're still
  discussing an api cleanup patch to make it a bit more abuse-safe as a
  follow-up
- dp aux interface for userspace for tools&tests from Rafael Antognolli 
- actual interface parts for dma-buf flushing for userspace mmap
- few small bits all over

... plus all the bits from last pull req. Why do I split them up ;-)

I'll be on vacation for 1 week now, will send final intel pull for 4.6 and
probably more drm-misc when I'm back.

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-18

for you to fetch changes up to a6ddd2f1b99f1c00b4e00289b13c3e451c7130b0:

  drm/udl: Use module_usb_driver (2016-02-17 14:19:30 +0100)

----------------------------------------------------------------
Amitoj Kaur Chawla (1):
      drm/udl: Use module_usb_driver

Arnd Bergmann (1):
      drm/msm: remove unused variable

Carlos Palminha (22):
      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.
      drm/virtio: removed optional dummy encoder mode_fixup function.
      drm/udl: removed optional dummy encoder mode_fixup function.
      drm/exynos: removed optional dummy encoder mode_fixup function.
      drm/amdgpu: removed optional dummy encoder mode_fixup function.
      drm/ast: removed optional dummy encoder mode_fixup function.
      drm/bochs: removed optional dummy encoder mode_fixup function.
      drm/cirrus: removed optional dummy encoder mode_fixup function.
      drm/radeon: removed optional dummy encoder mode_fixup function.
      drm/gma500: removed optional dummy encoder mode_fixup function.
      drm/imx: removed optional dummy encoder mode_fixup function.
      drm/msm/mdp: removed optional dummy encoder mode_fixup function.
      drm/mgag200: removed optional dummy encoder mode_fixup function.
      drm/qxl: removed optional dummy encoder mode_fixup function.
      drm/rockchip: removed optional dummy encoder mode_fixup function.
      drm/sti: removed optional dummy encoder mode_fixup function.
      drm/tilcdc: removed optional dummy encoder mode_fixup function.
      drm: fixes crct set_mode when crtc mode_fixup is null.

Daniel Thompson (1):
      drm: prime: Honour O_RDWR during prime-handle-to-fd

Daniel Vetter (2):
      dma-buf: Add ioctls to allow userspace to flush
      Merge branch 'topic/mode_fixup-optional' into topic/drm-misc

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 (7):
      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.
      drm/fb_helper: Use correct allocation count for arrays.
      drm/fb_helper: Use add_one_connector in add_all_connectors.

Rafael Antognolli (3):
      drm/kms_helper: Add a common place to call init and exit functions.
      drm/dp: Add a drm_aux-dev module for reading/writing dpcd registers.
      drm/i915: Set aux.dev to the drm_connector device, instead of drm_device.

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                |  40 ++-
 drivers/dma-buf/dma-buf.c                        |  58 +++-
 drivers/gpu/drm/Kconfig                          |   8 +
 drivers/gpu/drm/Makefile                         |   5 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c |   3 +-
 drivers/gpu/drm/amd/amdgpu/dce_v10_0.c           |   8 -
 drivers/gpu/drm/amd/amdgpu/dce_v11_0.c           |   8 -
 drivers/gpu/drm/amd/amdgpu/dce_v8_0.c            |   8 -
 drivers/gpu/drm/ast/ast_mode.c                   |   8 -
 drivers/gpu/drm/bochs/bochs_kms.c                |   8 -
 drivers/gpu/drm/bridge/dw-hdmi.c                 |   8 -
 drivers/gpu/drm/cirrus/cirrus_mode.c             |   9 -
 drivers/gpu/drm/drm_atomic_helper.c              |  57 +++-
 drivers/gpu/drm/drm_crtc.c                       |  65 ++++
 drivers/gpu/drm/drm_crtc_helper.c                |  22 +-
 drivers/gpu/drm/drm_dp_aux_dev.c                 | 368 +++++++++++++++++++++++
 drivers/gpu/drm/drm_dp_helper.c                  |  16 +-
 drivers/gpu/drm/drm_edid.c                       |  26 ++
 drivers/gpu/drm/drm_encoder_slave.c              |   3 +
 drivers/gpu/drm/drm_fb_helper.c                  |  35 +--
 drivers/gpu/drm/drm_kms_helper_common.c          |  60 ++++
 drivers/gpu/drm/drm_modes.c                      |   3 +-
 drivers/gpu/drm/drm_prime.c                      |  10 +-
 drivers/gpu/drm/exynos/exynos_dp_core.c          |   8 -
 drivers/gpu/drm/exynos/exynos_drm_dpi.c          |   8 -
 drivers/gpu/drm/exynos/exynos_drm_dsi.c          |   8 -
 drivers/gpu/drm/exynos/exynos_drm_vidi.c         |   8 -
 drivers/gpu/drm/gma500/cdv_intel_crt.c           |   1 -
 drivers/gpu/drm/gma500/cdv_intel_hdmi.c          |   1 -
 drivers/gpu/drm/gma500/gma_display.c             |   7 -
 drivers/gpu/drm/gma500/gma_display.h             |   3 -
 drivers/gpu/drm/gma500/intel_gmbus.c             |   2 +-
 drivers/gpu/drm/gma500/oaktrail_hdmi.c           |   1 -
 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_dp.c                  |  18 +-
 drivers/gpu/drm/i915/intel_lvds.c                |   8 +-
 drivers/gpu/drm/imx/dw_hdmi-imx.c                |   8 -
 drivers/gpu/drm/imx/imx-ldb.c                    |   8 -
 drivers/gpu/drm/imx/imx-tve.c                    |   8 -
 drivers/gpu/drm/imx/parallel-display.c           |   8 -
 drivers/gpu/drm/mgag200/mgag200_mode.c           |   8 -
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c  |   8 -
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c  |   8 -
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c |   8 -
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c  |   9 -
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.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/qxl/qxl_display.c                |   9 -
 drivers/gpu/drm/radeon/atombios_encoders.c       |   8 -
 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/rockchip/dw-mipi-dsi.c           |   8 -
 drivers/gpu/drm/sti/sti_tvout.c                  |  10 -
 drivers/gpu/drm/tilcdc/tilcdc_panel.c            |   9 -
 drivers/gpu/drm/tilcdc/tilcdc_tfp410.c           |   9 -
 drivers/gpu/drm/udl/udl_drv.c                    |  14 +-
 drivers/gpu/drm/udl/udl_encoder.c                |   8 -
 drivers/gpu/drm/udl/udl_fb.c                     |   2 -
 drivers/gpu/drm/virtio/virtgpu_display.c         |   8 -
 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_dp_aux_dev.h                     |  62 ++++
 include/drm/drm_fb_helper.h                      |   6 +
 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 +
 include/uapi/linux/dma-buf.h                     |  40 +++
 83 files changed, 1260 insertions(+), 428 deletions(-)
 create mode 100644 drivers/gpu/drm/drm_dp_aux_dev.c
 create mode 100644 drivers/gpu/drm/drm_kms_helper_common.c
 create mode 100644 include/drm/drm_dp_aux_dev.h
 create mode 100644 include/linux/apple-gmux.h
 create mode 100644 include/uapi/linux/dma-buf.h

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


More information about the Intel-gfx mailing list