Skip to contentSkip to conversation

topic/core-stuff for 3.18

GIT PULL Daniel Vetter 1 participant 1 message Aug 15, 2014

lore
Share & tools
lore
#0 lore raw

Hi Dave,

So small drm stuff all over for 3.18. Biggest one is the cmdline parsing from Chris with a few fixes from me to make it work for stupid kernel configs.

Plus the atomic prep series.

Tested for more than a week in -nightly and Ville/Imre indeed discovered some fun which is now fixed (and i915 vblank patches postponed since the fixups need this branch plus drm-intel-next merged together).

Cheers, Daniel

The following changes since commit 168c02ec06f891990617cee2abbba70858c071e7:

drm: Fix race when checking for fb in the generic kms obj lookup (2014-08-05 11:06:52 +1000)

are available in the git repository at:

git://anongit.freedesktop.org/drm-intel tags/topic/core-stuff-2014-08-15

for you to fetch changes up to 14f476fa24e81d0beea1aa14d763102958518d60:

drm: Use the type of the array element when reallocating (2014-08-14 21:24:30 +0200)

----------------------------------------------------------------
Chris Wilson (1):
drm: Perform cmdline mode parsing during connector initialisation

Damien Lespiau (2):
drm: Don't return 0 for a value used as a denominator
drm: Use the type of the array element when reallocating

Daniel Vetter (10):
drm: Don't grab an fb reference for the idr video/fbdev: Always built-in video= cmdline parsing
drm: Add drm_plane/connector_index
drm: Move modeset_lock_all helpers to drm_modeset_lock.[hc]
drm: Handle legacy per-crtc locking with full acquire ctx
drm: Move ->old_fb from crtc to plane
drm: trylock modest locking for fbdev panics
drm: Add a plane->reset hook
drm/irq: Implement a generic vblank_wait function
drm: Docbook fixes

Rob Clark (1):
drm: idiot-proof vblank

Ville Syrjälä (1):
drm: Warn when leaking flip events on close

 drivers/gpu/drm/Kconfig                |   1 +
 drivers/gpu/drm/drm_crtc.c             | 306 ++++++++++++++++++---------------
 drivers/gpu/drm/drm_dp_mst_topology.c  |   3 +-
 drivers/gpu/drm/drm_edid.c             |   2 +-
 drivers/gpu/drm/drm_fb_helper.c        |  76 +-------
 drivers/gpu/drm/drm_fops.c             |   2 +
 drivers/gpu/drm/drm_irq.c              |  68 ++++++++
 drivers/gpu/drm/drm_modes.c            |   1 +
 drivers/gpu/drm/drm_modeset_lock.c     | 213 ++++++++++++++++++++++-
 drivers/gpu/drm/drm_probe_helper.c     |  17 ++
 drivers/gpu/drm/mgag200/mgag200_mode.c |  21 +--
 drivers/video/fbdev/Kconfig            |   4 +
 drivers/video/fbdev/core/Makefile      |   1 +
 drivers/video/fbdev/core/fb_cmdline.c  | 110 ++++++++++++
 drivers/video/fbdev/core/fbmem.c       |  92 ----------
 drivers/video/fbdev/core/modedb.c      |   3 -
 include/drm/drmP.h                     |   2 +
 include/drm/drm_crtc.h                 |  22 ++-
 include/drm/drm_fb_helper.h            |   1 -
 include/drm/drm_modeset_lock.h         |  16 ++
 20 files changed, 630 insertions(+), 331 deletions(-)
 create mode 100644 drivers/video/fbdev/core/fb_cmdline.c
Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch