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

Daniel Vetter daniel.vetter at ffwll.ch
Tue Jun 7 20:00:53 UTC 2016


Hi Dave,

As promised, piles of prep work all around:
- drm_atomic_state rework, prep for nonblocking commit helpers
- fence patches from Gustavo and Christian to prep for atomic fences and
  some cool work in ttm/amdgpu from Christian
- drm event prep for both nonblocking commit and atomic fences
- Gustavo seems on a crusade against the non-kms-native version of the
  vblank functions.
- prep work from Boris to nuke all the silly ->best_encoder
  implementations we have (we really only need that for truly dynamic
  cases like dvi-i vs dvi-d or dp mst selecting the right transcoder on
  intel)
- prep work from Laurent to rework the format handling functions
- and few small things all over

btw since -rc2 has drm-fixes now you can also pull in the earlier pull req
from last week from me that you delayed.

Cheers, Daniel


The following changes since commit 66fd7a66e8b9e11e49f46ea77910f935c4dee5c3:

  Merge branch 'drm-intel-next' of git://anongit.freedesktop.org/drm-intel into drm-next (2016-06-02 07:58:36 +1000)

are available in the git repository at:

  git://anongit.freedesktop.org/drm-intel tags/topic/drm-misc-2016-06-07

for you to fetch changes up to e8395081636734da19778b0446d65588a06bc40d:

  drm/dsi: Implement set tear scanline (2016-06-07 21:44:29 +0200)

----------------------------------------------------------------
Boris Brezillon (2):
      drm/atomic: Handle funcs->best_encoder == NULL case
      drm/atomic: Fix remaining places where !funcs->best_encoder is valid

Chris Wilson (2):
      drm: Only create a cmdline mode if no probed modes match
      drm: Store the plane's index

Christian König (2):
      dma-buf/fence: make fence context 64 bit v2
      dma-buf/fence: add signal_on_any to the fence array v2

Daniel Vetter (20):
      drm/atomic-helper: use for_each_*_in_state more
      drm/hdlcd: Clean up crtc hooks
      drm/i915: Use drm_atomic_get_existing_plane_state
      drm/msm: Use for_each_*_in_state
      drm/rcar-du: Use for_each_*_in_state
      drm/vc4: Use for_each_plane_in_state
      drm/omap: Use for_each_plane_in_state
      drm/exynos: Use for_each_crtc_in_state
      drm/doc: Appease sphinx
      drm/atomic: Add drm_atomic_crtc_state_for_each_plane_state
      drm: Consolidate connector arrays in drm_atomic_state
      drm: Consolidate plane arrays in drm_atomic_state
      drm: Consolidate crtc arrays in drm_atomic_state
      drm/atomic-docs: Spelling fixups
      drm/doc: Update kerneldoc for drm_crtc.h
      drm/atomic-helper: Fixup kerneldoc for drm_atomic_helper_legacy_gamma_set
      drm/doc: Improve kernel-doc for drm_fb_cma_helper.c
      drm/gpu.tmpl: Don't forget to rename the include directives, too
      drm/doc: Drop kerneldoc for static functions in drm_irq.c
      drm/doc: Switch to sphinx/rst fixed-width quoting

Gustavo Padovan (15):
      dma-buf/fence: add fence_array fences v6
      drm/fence: add fence to drm_pending_event
      dma-buf/sync_file: fix build warning with context format type
      drm/armada: use drm_crtc_send_vblank_event()
      drm/atmel: use drm_crtc_send_vblank_event()
      drm/qxl: use drm_crtc_send_vblank_event()
      drm/udl: use drm_crtc_send_vblank_event()
      drm/virtio: use drm_crtc_send_vblank_event()
      drm/amdgpu: use drm_crtc_vblank_{get,put}()
      drm/armada: use drm_crtc_vblank_{get,put}()
      drm/atmel: use drm_crtc_vblank_{get,put}()
      drm/qxl: use drm_crtc_vblank_{get,put}()
      drm/radeon: use drm_crtc_vblank_{get,put}()
      drm/shmobile: use drm_crtc_vblank_{get,put}()
      Documentation: add fence-array to kernel DocBook

Laurent Pinchart (2):
      drm/ast: Remove useless drm_fb_get_bpp_depth() call
      drm/qxl: Remove useless drm_fb_get_bpp_depth() call

Liviu Dudau (1):
      drm: Update obsolete information from {enable/disable}_vblank hooks.

Maarten Lankhorst (1):
      drm/core: Change declaration for gamma_set.

Robin Murphy (1):
      drm/fb_cma_helper: Implement fb_mmap callback

Vinay Simha BN (1):
      drm/dsi: Implement set tear scanline

 Documentation/DocBook/device-drivers.tmpl      |   2 +
 Documentation/DocBook/gpu.tmpl                 |   2 +-
 drivers/dma-buf/Makefile                       |   2 +-
 drivers/dma-buf/fence-array.c                  | 144 ++++++++++++++++++++++
 drivers/dma-buf/fence.c                        |   8 +-
 drivers/dma-buf/sync_file.c                    |   2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu.h            |   2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_display.c    |   4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c         |   2 +-
 drivers/gpu/drm/amd/amdgpu/dce_v10_0.c         |  12 +-
 drivers/gpu/drm/amd/amdgpu/dce_v11_0.c         |  12 +-
 drivers/gpu/drm/amd/amdgpu/dce_v8_0.c          |  12 +-
 drivers/gpu/drm/arc/arcpgu_drv.c               |   2 +-
 drivers/gpu/drm/arm/hdlcd_crtc.c               |  19 ---
 drivers/gpu/drm/armada/armada_crtc.c           |  14 +--
 drivers/gpu/drm/ast/ast_fb.c                   |   3 -
 drivers/gpu/drm/ast/ast_mode.c                 |  10 +-
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c |   4 +-
 drivers/gpu/drm/cirrus/cirrus_mode.c           |   8 +-
 drivers/gpu/drm/drm_atomic.c                   |  80 ++++++------
 drivers/gpu/drm/drm_atomic_helper.c            |  76 +++++-------
 drivers/gpu/drm/drm_bridge.c                   |   2 +-
 drivers/gpu/drm/drm_crtc.c                     | 102 ++++------------
 drivers/gpu/drm/drm_fb_cma_helper.c            |  27 +++--
 drivers/gpu/drm/drm_fb_helper.c                |  15 ++-
 drivers/gpu/drm/drm_fops.c                     |  18 +--
 drivers/gpu/drm/drm_gem.c                      |   2 +-
 drivers/gpu/drm/drm_irq.c                      |  12 +-
 drivers/gpu/drm/drm_mipi_dsi.c                 |  22 ++++
 drivers/gpu/drm/drm_modes.c                    |   4 +-
 drivers/gpu/drm/drm_modeset_lock.c             |   2 +-
 drivers/gpu/drm/drm_plane_helper.c             |  10 +-
 drivers/gpu/drm/drm_probe_helper.c             |  21 +++-
 drivers/gpu/drm/drm_vma_manager.c              |   3 +
 drivers/gpu/drm/etnaviv/etnaviv_gpu.h          |   2 +-
 drivers/gpu/drm/exynos/exynos_drm_drv.c        |   8 +-
 drivers/gpu/drm/gma500/gma_display.c           |   9 +-
 drivers/gpu/drm/gma500/gma_display.h           |   4 +-
 drivers/gpu/drm/i915/i915_reg.h                |   2 +-
 drivers/gpu/drm/i915/i915_vgpu.c               |  24 ++--
 drivers/gpu/drm/i915/intel_atomic.c            |   5 +-
 drivers/gpu/drm/i915/intel_dp.c                |  16 +--
 drivers/gpu/drm/i915/intel_fbc.c               |   3 +-
 drivers/gpu/drm/mgag200/mgag200_mode.c         |   9 +-
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c        |  20 ++-
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c       |  10 +-
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c        |  12 +-
 drivers/gpu/drm/msm/msm_atomic.c               |  37 ++----
 drivers/gpu/drm/nouveau/dispnv04/crtc.c        |  12 +-
 drivers/gpu/drm/nouveau/nouveau_fence.h        |   3 +-
 drivers/gpu/drm/nouveau/nouveau_usif.c         |   1 -
 drivers/gpu/drm/nouveau/nv50_display.c         |   9 +-
 drivers/gpu/drm/omapdrm/omap_drv.c             |  11 +-
 drivers/gpu/drm/qxl/qxl_display.c              |   7 +-
 drivers/gpu/drm/qxl/qxl_fb.c                   |   4 -
 drivers/gpu/drm/qxl/qxl_release.c              |   2 +-
 drivers/gpu/drm/radeon/radeon.h                |   2 +-
 drivers/gpu/drm/radeon/radeon_display.c        |  17 +--
 drivers/gpu/drm/radeon/radeon_pm.c             |  13 +-
 drivers/gpu/drm/rcar-du/rcar_du_kms.c          |   8 +-
 drivers/gpu/drm/rcar-du/rcar_du_plane.c        |  20 ++-
 drivers/gpu/drm/rockchip/rockchip_drm_vop.c    |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_crtc.c      |   4 +-
 drivers/gpu/drm/udl/udl_modeset.c              |   2 +-
 drivers/gpu/drm/vc4/vc4_crtc.c                 |  21 ++--
 drivers/gpu/drm/vc4/vc4_drv.h                  |   2 +-
 drivers/gpu/drm/vc4/vc4_kms.c                  |  10 +-
 drivers/gpu/drm/vc4/vc4_plane.c                |   5 +-
 drivers/gpu/drm/virtio/virtgpu_display.c       |   2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_fence.c          |   2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c            |   8 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.h            |   4 +-
 drivers/staging/android/sync.h                 |   3 +-
 include/drm/drmP.h                             |  13 +-
 include/drm/drm_atomic.h                       |  66 +++++++---
 include/drm/drm_atomic_helper.h                |  30 ++++-
 include/drm/drm_crtc.h                         | 161 ++++++++++++++++++++-----
 include/drm/drm_mipi_dsi.h                     |   1 +
 include/drm/drm_modes.h                        |   2 +
 include/drm/drm_modeset_helper_vtables.h       |  10 +-
 include/linux/fence-array.h                    |  73 +++++++++++
 include/linux/fence.h                          |  13 +-
 82 files changed, 847 insertions(+), 517 deletions(-)
 create mode 100644 drivers/dma-buf/fence-array.c
 create mode 100644 include/linux/fence-array.h

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


More information about the Intel-gfx mailing list