[PULL] topic/drm-misc

Daniel Vetter daniel.vetter at ffwll.ch
Mon Jul 13 00:22:37 PDT 2015


Hi Dave,

First pull request for 4.3! Random things all over, most of it more atomic
polish. Plus trying to reject more dri1 crap (the final bits afaik!), but
this time around with nouveau whitelisted to avoid breaking old userspace.

Aside: 4.2 vs 4.3 is a terrible conflict mess so I need you to roll
drm-next forward first before I can send you a pull with a proposed
solution.

Cheers, Daniel


The following changes since commit 8b72ce158cf0dba443e36fc66e0bb29c2580e0b6:

  drm: Always enable atomic API (2015-06-24 11:21:35 +1000)

are available in the git repository at:

  git://anongit.freedesktop.org/drm-intel tags/topic/drm-misc-2015-07-13

for you to fetch changes up to 1055e0687f581cf988bb2239a00d1396e18ef114:

  drm/fourcc: Add formats R8, RG88, GR88 (2015-07-09 15:12:41 +0200)

----------------------------------------------------------------
Chad Versace (1):
      drm/fourcc: Add formats R8, RG88, GR88

Daniel Vetter (5):
      drm: Convert drm_legacy_ctxbitmap_init to void return type
      drm: Reject DRI1 hw lock ioctl functions for kms drivers
      drm/crtc-helper: Fixup error handling in drm_helper_crtc_mode_set
      drm: reset empty state in transitional helpers
      drm: Update plane->fb also for page_flip

Jarkko Sakkinen (1):
      drm: remove redundant code form drm_ioc32.c

Maarten Lankhorst (2):
      drm/atomic: Update old_fb after setting a property.
      drm/atomic: Cleanup on error properly in the atomic ioctl.

Peter Antoine (1):
      drm: Turn off Legacy Context Functions

Thierry Reding (1):
      drm: Remove useless blank line

 drivers/gpu/drm/drm_atomic.c          | 76 +++++++++++++++++------------------
 drivers/gpu/drm/drm_atomic_helper.c   |  4 --
 drivers/gpu/drm/drm_context.c         | 51 ++++++++++++++++++++++-
 drivers/gpu/drm/drm_crtc.c            |  9 +----
 drivers/gpu/drm/drm_crtc_helper.c     | 24 +++++------
 drivers/gpu/drm/drm_drv.c             |  7 +---
 drivers/gpu/drm/drm_ioc32.c           | 55 ++++++++++++-------------
 drivers/gpu/drm/drm_legacy.h          |  2 +-
 drivers/gpu/drm/drm_lock.c            |  6 +++
 drivers/gpu/drm/drm_plane_helper.c    | 16 +++++---
 drivers/gpu/drm/nouveau/nouveau_drm.c |  3 +-
 include/drm/drmP.h                    | 23 ++++++-----
 include/uapi/drm/drm_fourcc.h         |  7 ++++
 13 files changed, 163 insertions(+), 120 deletions(-)

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


More information about the dri-devel mailing list