[PULL] topic/drm-misc

Daniel Vetter daniel at ffwll.ch
Tue Sep 22 02:17:03 PDT 2015


On Tue, Sep 22, 2015 at 11:05:00AM +0200, Daniel Vetter wrote:
> Hi Dave,
> 
> Updated drm-misc pull, now with backmerge and atomic fbdev:
> - better atomic helpers for runtime pm drivers
> - atomic fbdev
> - dp aux i2c STATUS_UPDATE handling (for short i2c replies from the sink)
> - bunch of constify patches
> - various polish all over
> - inital kerneldoc for vga switcheroo

Meh, generated pull before I update the remote with the merge and my
script didn't noticed ... updated pull below.
-Daniel

The following changes since commit 1f93e4a96c9109378204c147b3eec0d0e8100fde:

  Linux 4.3-rc2 (2015-09-20 14:32:34 -0700)

are available in the git repository at:

  git://anongit.freedesktop.org/drm-intel tags/topic/drm-misc-2015-09-22-fixed

for you to fetch changes up to 20ede1adf4d9bef298ceec137a23d6faa0f323d8:

  Merge tag 'v4.3-rc2' into topic/drm-misc (2015-09-22 11:02:18 +0200)

----------------------------------------------------------------
Bob Paauwe (1):
      dtrm/edid: Allow comma separated edid binaries. (v3)

Daniel Vetter (9):
      drm/atomic-helper: properly annotate functions in kerneldoc
      drm/fb-helper: Use -errno return in restore_mode_unlocked
      drm: Make drm_fb_unregister/remove accept NULL fb
      drm/fb-helper: Add module option to disable fbdev emulation
      drm/atomic: refuse changing CRTC for planes directly
      drm/atomic-helper: Add option to update planes only on active crtc
      drm/atomic-helper: Pimp docs with recommendations for rpm drivers
      drm: Nuke drm_framebuffer->helper_private
      Merge tag 'v4.3-rc2' into topic/drm-misc

Danilo Cesar Lemes de Paula (1):
      drm/doc: Fixing xml documentation warning

David Herrmann (2):
      drm: simplify drm_sysfs_destroy() via IS_ERR_OR_NULL()
      drm: move drm_class into drm_sysfs.c

Gustavo Padovan (1):
      drm: WARN_ON if a modeset driver uses legacy suspend/resume helpers

Laurent Pinchart (1):
      drm/atomic-helper: Don't skip plane disabling on active CRTC

Lukas Wunner (1):
      vga_switcheroo: Document _ALL_ the things!

Maarten Lankhorst (3):
      drm/atomic: Make sure lock is held in trylock contexts.
      drm/atomic: Make prepare_fb/cleanup_fb only take state, v3.
      drm/core: Do not call drm_framebuffer_remove internally during teardown.

Michel Thierry (1):
      drm/mm: Do DRM_MM_CREATE_TOP adj_start calculation after color_adjust

Rob Clark (5):
      drm: cleanup modesetting ioctls, one param per line
      drm/fb-helper: add headerdoc for drm_fb_helper
      drm/fb-helper: atomic restore_fbdev_mode()..
      drm/fb-helper: atomic pan_display()..
      drm/i915: enable atomic fb-helper

Thierry Reding (1):
      drm/atomic-helper: Implement drm_atomic_helper_duplicate_state()

Ville Syrjälä (11):
      drm: Constify generic_edid_names[]
      drm: Constify TV mode names
      drm/i2c/ch7006: Constify ch7006_tv_norms[] and ch7006_modes[]
      drm/dp: s/I2C_STATUS/I2C_WRITE_STATUS_UPDATE/
      drm/i915: Handle DP_AUX_I2C_WRITE_STATUS_UPDATE
      drm/radeon: Handle DP_AUX_I2C_WRITE_STATUS_UPDATE
      drm/tegra: Handle I2C_WRITE_STATUS_UPDATE for address only writes
      drm/dp: Use I2C_WRITE_STATUS_UPDATE to drain partial I2C_WRITE requests
      drm: Make some modes const when iterating through them
      drm: Remove the 'mode' argument from drm_select_eld()
      drm: Make drm_av_sync_delay() 'mode' argument const

 Documentation/kernel-parameters.txt             |  15 ++--
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c |   4 +-
 drivers/gpu/drm/drm_atomic.c                    |  25 +++++++
 drivers/gpu/drm/drm_atomic_helper.c             | 316 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------
 drivers/gpu/drm/drm_crtc.c                      |  18 +++--
 drivers/gpu/drm/drm_dp_helper.c                 |  44 ++++++++++--
 drivers/gpu/drm/drm_drv.c                       |   8 +--
 drivers/gpu/drm/drm_edid.c                      |   8 +--
 drivers/gpu/drm/drm_edid_load.c                 |  43 ++++++++---
 drivers/gpu/drm/drm_fb_helper.c                 | 178 ++++++++++++++++++++++++++++++++++++++++++---
 drivers/gpu/drm/drm_internal.h                  |   2 +-
 drivers/gpu/drm/drm_mm.c                        |   6 +-
 drivers/gpu/drm/drm_modeset_lock.c              |   2 +
 drivers/gpu/drm/drm_plane_helper.c              |   6 +-
 drivers/gpu/drm/drm_sysfs.c                     |  49 ++++++-------
 drivers/gpu/drm/exynos/exynos_drm_drv.c         |   2 +-
 drivers/gpu/drm/i2c/ch7006_drv.c                |   6 +-
 drivers/gpu/drm/i2c/ch7006_mode.c               |  26 +++----
 drivers/gpu/drm/i2c/ch7006_priv.h               |  12 ++--
 drivers/gpu/drm/i915/intel_audio.c              |   2 +-
 drivers/gpu/drm/i915/intel_display.c            |   9 ++-
 drivers/gpu/drm/i915/intel_dp.c                 |   1 +
 drivers/gpu/drm/i915/intel_drv.h                |   2 -
 drivers/gpu/drm/i915/intel_fbdev.c              |   2 +
 drivers/gpu/drm/i915/intel_tv.c                 |   4 +-
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c       |  10 ++-
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c       |  10 ++-
 drivers/gpu/drm/msm/msm_atomic.c                |   2 +-
 drivers/gpu/drm/nouveau/dispnv04/tvmodesnv17.c  |   2 +-
 drivers/gpu/drm/nouveau/dispnv04/tvnv17.h       |   2 +-
 drivers/gpu/drm/omapdrm/omap_drv.c              |   2 +-
 drivers/gpu/drm/omapdrm/omap_plane.c            |  10 +--
 drivers/gpu/drm/radeon/atombios_dp.c            |   1 +
 drivers/gpu/drm/rcar-du/rcar_du_kms.c           |   2 +-
 drivers/gpu/drm/sti/sti_drv.c                   |   2 +-
 drivers/gpu/drm/tegra/dc.c                      |   2 -
 drivers/gpu/drm/tegra/dpaux.c                   |   3 +-
 drivers/gpu/drm/tegra/drm.c                     |   2 +-
 drivers/gpu/vga/vga_switcheroo.c                | 285 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 include/drm/drm_atomic_helper.h                 |  12 +++-
 include/drm/drm_crtc.h                          |   4 +-
 include/drm/drm_dp_helper.h                     |   2 +-
 include/drm/drm_edid.h                          |   5 +-
 include/drm/drm_fb_helper.h                     |  31 +++++++-
 include/drm/drm_modeset_lock.h                  |  10 +--
 include/drm/drm_plane_helper.h                  |   2 -
 include/linux/vga_switcheroo.h                  |  85 +++++++++++++++++++++-
 include/uapi/drm/drm_mode.h                     |  42 +++++++----
 48 files changed, 1064 insertions(+), 254 deletions(-)
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


More information about the dri-devel mailing list