[PULL] drm init cleanup for drm-next

Daniel Vetter daniel at ffwll.ch
Wed Apr 23 03:43:28 PDT 2014


On Wed, Apr 23, 2014 at 12:26:53PM +0200, Daniel Vetter wrote:
> Hi Dave,
> 
> Next pull request, this time more of the drm de-midlayering work. The big
> thing is that his patch series here removes everything from drm_bus except
> the set_busid callback. Thierry has a few more patches on top of this to
> make that one optional to.
> 
> With that we can ditch all the non-pci drm_bus implementations, which
> Thierry has already done for the fake tegra host1x drm_bus.
> 
> Reviewed by Thierry, Laurent and David and now also survived some testing
> on my intel boxes to make sure the irq fumble is fixed correctly ;-) The
> last minute rebase was just to add the r-b tags from Thierry for the 2
> patches I've redone.
> 
> Cheers, Daniel

Hah, 2nd pull requests without scripts and already screwed it up - the
DRM_WAIT_ON removal shouldn't be in here.
-Daniel

The following changes since commit a798c10faf62a505d24e5f6213fbaf904a39623f:

  Linux 3.15-rc2 (2014-04-20 11:08:50 -0700)

are available in the git repository at:

  git://people.freedesktop.org/~danvet/drm drm-init-cleanup

for you to fetch changes up to 3c8413951cbd8a2d855740823fc547c97b845f6f:

  drm/<drivers>: don't set driver->dev_priv_size to 0 (2014-04-23 10:32:54 +0200)

----------------------------------------------------------------
Daniel Vetter (17):
      drm/irq: simplify irq checks in drm_wait_vblank
      drm/pci: fold in irq_by_busid support
      drm/irq: drm_control is a legacy ioctl, so pci devices only
      drm/irq: remove cargo-culted locking from irq_install/uninstall
      drm: remove drm_dev_to_irq from drivers
      drm: kill drm_bus->bus_type
      drm: Rip out totally bogus vga_switcheroo->can_switch locking
      drm: rename dev->count_lock to dev->buf_lock
      drm/irq: track the irq installed in drm_irq_install in dev->irq
      drm/irq: Look up the pci irq directly in the drm_control ioctl
      drm: pass the irq explicitly to drm_irq_install
      drm: remove bus->get_irq implementations
      drm: inline drm_pci_set_unique
      drm: rip out dev->devname
      drm: remove drm_bus->get_name
      drm: Remove dev->kdriver
      drm/<drivers>: don't set driver->dev_priv_size to 0

 Documentation/DocBook/drm.tmpl           |  10 +-------
 drivers/gpu/drm/armada/armada_drv.c      |   2 +-
 drivers/gpu/drm/ast/ast_drv.c            |   1 -
 drivers/gpu/drm/drm_bufs.c               |  32 +++++++++++++-------------
 drivers/gpu/drm/drm_info.c               |   6 ++---
 drivers/gpu/drm/drm_ioctl.c              |  13 ++++++-----
 drivers/gpu/drm/drm_irq.c                | 105 ++++++++++++++++++++++++++++--------------------------------------------------------
 drivers/gpu/drm/drm_pci.c                |  93 +++++++++++++++++++++++++++++++++++++-------------------------------------
 drivers/gpu/drm/drm_platform.c           |  25 --------------------
 drivers/gpu/drm/drm_stub.c               |   7 +-----
 drivers/gpu/drm/drm_usb.c                |  14 ------------
 drivers/gpu/drm/gma500/psb_drv.c         |   2 +-
 drivers/gpu/drm/i915/i915_dma.c          |  13 ++++++-----
 drivers/gpu/drm/i915/i915_drv.c          |   9 ++++++--
 drivers/gpu/drm/i915/i915_gem.c          |   7 +++---
 drivers/gpu/drm/mga/mga_state.c          |   2 +-
 drivers/gpu/drm/msm/msm_drv.c            |   2 +-
 drivers/gpu/drm/nouveau/nouveau_vga.c    |  11 +++++----
 drivers/gpu/drm/qxl/qxl_drv.c            |   1 -
 drivers/gpu/drm/qxl/qxl_irq.c            |   2 +-
 drivers/gpu/drm/r128/r128_state.c        |   2 +-
 drivers/gpu/drm/radeon/radeon_device.c   |  11 +++++----
 drivers/gpu/drm/radeon/radeon_drv.c      |   1 -
 drivers/gpu/drm/radeon/radeon_irq_kms.c  |   2 +-
 drivers/gpu/drm/radeon/radeon_state.c    |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_drv.c |   2 +-
 drivers/gpu/drm/tegra/bus.c              |  11 ---------
 drivers/gpu/drm/tilcdc/tilcdc_drv.c      |   2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c      |   2 +-
 include/drm/drmP.h                       |  33 +++++++--------------------
 30 files changed, 158 insertions(+), 267 deletions(-)
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch


More information about the dri-devel mailing list