[PULL] topic/drm-misc

Daniel Vetter daniel at ffwll.ch
Mon Mar 14 06:47:17 UTC 2016


On Wed, Mar 09, 2016 at 10:56:46AM +0100, Daniel Vetter wrote:
> Hi Dave,
> 
> I expect this to be the final drm-misc pull for 4.6:
> - color manager core patch from Lionel - i915 side is ready too, but will
>   only land in 4.7, but I figured it's better to land this earlier for
>   better coordination with other plane stuff (like alpha/blending) going
>   on.
> - more mode_fixup dummy func removal from Carlos (I think that's all now).
> - atomic connector stealing fixes Maarten (maybe this time around, Maarten
>   added testcases for it to igt too).

Color manager patch from Lionel needed some fixup. And somehow the 2nd
pull request got lost, so third time's the charm ;-) I've thrown the SAD
extraction patch from Ville on top for this one.
-Daniel

The following changes since commit 44ab4042178bd596275927ea050980aa4257581b:

  Merge branch 'for-next' of http://git.agner.ch/git/linux-drm-fsl-dcu into drm-next (2016-02-26 13:02:57 +1000)

are available in the git repository at:

  git://anongit.freedesktop.org/drm-intel tags/topic/drm-misc-2016-03-14

for you to fetch changes up to c1f415c9acb5877c408d9311eb837d7d50636a68:

  drm: atomic helper: do not unreference error pointer (2016-03-13 19:39:54 +0100)

----------------------------------------------------------------
Carlos Palminha (15):
      drm/cirrus: removed optional dummy crtc mode_fixup function.
      drm/mgag200: removed optional dummy crtc mode_fixup function.
      drm/udl: removed optional dummy crtc mode_fixup function.
      drm/gma: removed optional dummy crtc mode_fixup function.
      drm/rcar-du: removed optional dummy crtc mode_fixup function.
      drm/omapdrm: removed optional dummy crtc mode_fixup function.
      drm/msm/mdp: removed optional dummy crtc mode_fixup function.
      drm/shmobile: removed optional dummy crtc mode_fixup function.
      drm/sti: removed optional dummy crtc mode_fixup function.
      drm/atmel-hlcdc: remove optional dummy crtc mode_fixup function.
      drm/nouveau/dispnv04: removed optional dummy crtc mode_fixup function.
      drm/virtio: removed optional dummy crtc mode_fixup function.
      drm/fsl-dcu: removed optional dummy crtc mode_fixup function.
      drm/bochs: removed optional dummy crtc mode_fixup function.
      drm/ast: removed optional dummy crtc mode_fixup function.

Lionel Landwerlin (3):
      drm: introduce pipe color correction properties
      drm: fix blob pointer check
      drm: atomic helper: do not unreference error pointer

Liu Ying (1):
      drm/crtc: Use drm_mode_object_put() in __drm_framebuffer_unregister()

Maarten Lankhorst (7):
      drm/atomic: Clean up update_output_state.
      drm/atomic: Pass connector and state to update_connector_routing.
      drm/atomic: Always call steal_encoder, v2.
      drm/atomic: Handle encoder stealing from set_config better.
      drm/atomic: Handle encoder assignment conflicts in a separate check, v3.
      drm/atomic: Clean up steal_encoder, v2.
      drm/atomic: Clean up update_connector_routing.

Ville Syrjälä (1):
      drm/edid: Extract SADs properly from multiple audio data blocks

 Documentation/DocBook/gpu.tmpl                 |  59 +++-
 drivers/gpu/drm/ast/ast_mode.c                 |   8 -
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c |   9 -
 drivers/gpu/drm/bochs/bochs_kms.c              |   8 -
 drivers/gpu/drm/cirrus/cirrus_mode.c           |  13 -
 drivers/gpu/drm/drm_atomic.c                   |  88 +++++-
 drivers/gpu/drm/drm_atomic_helper.c            | 362 ++++++++++++++++---------
 drivers/gpu/drm/drm_crtc.c                     |  39 ++-
 drivers/gpu/drm/drm_crtc_helper.c              |  33 +++
 drivers/gpu/drm/drm_edid.c                     |  17 +-
 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c     |   8 -
 drivers/gpu/drm/gma500/cdv_intel_display.c     |  13 +-
 drivers/gpu/drm/gma500/gma_display.c           |   7 -
 drivers/gpu/drm/gma500/gma_display.h           |   3 -
 drivers/gpu/drm/gma500/mdfld_intel_display.c   |   2 -
 drivers/gpu/drm/gma500/oaktrail_crtc.c         |   1 -
 drivers/gpu/drm/gma500/psb_intel_display.c     |   1 -
 drivers/gpu/drm/mgag200/mgag200_mode.c         |  13 -
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c       |   8 -
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c       |   8 -
 drivers/gpu/drm/nouveau/dispnv04/crtc.c        |   8 -
 drivers/gpu/drm/omapdrm/omap_crtc.c            |   8 -
 drivers/gpu/drm/rcar-du/rcar_du_crtc.c         |   9 -
 drivers/gpu/drm/shmobile/shmob_drm_crtc.c      |   8 -
 drivers/gpu/drm/sti/sti_crtc.c                 |   9 -
 drivers/gpu/drm/udl/udl_modeset.c              |   9 -
 drivers/gpu/drm/virtio/virtgpu_display.c       |   8 -
 include/drm/drm_atomic_helper.h                |   3 +
 include/drm/drm_crtc.h                         |  48 +++-
 include/drm/drm_crtc_helper.h                  |   3 +
 include/uapi/drm/drm_mode.h                    |  15 +
 31 files changed, 536 insertions(+), 292 deletions(-)
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


More information about the dri-devel mailing list