[pull] omapdrm-next for 3.9

Rob Clark robdclark at gmail.com
Sun Feb 17 15:02:04 PST 2013


Hi Dave,

This pull moves omapdrm out of staging into drivers/gpu/drm..  since
there are a couple patches already in staging-next, I cherry-picked
these onto omapdrm-next (which is based on drm-next rather than
staging-next).  I've also added a couple of Daniel's omapdrm patches,
fixed up to apply in drivers/gpu/drm.

----------
The following changes since commit 3314fdf8b44bd4914050614fa2c56b7c587fabc2:

  Merge branch 'drm-fb-helper' of
git://people.freedesktop.org/~danvet/drm into drm-next (2013-02-15
10:22:01 +1000)

are available in the git repository at:


  git://people.freedesktop.org/~robclark/linux omapdrm-next

for you to fetch changes up to 8e44770f093c003d11784060fea4ffc82ad576eb:

  drm/omap: remove fbdev debug enter/leave hooks (2013-02-16 18:14:04 -0500)

----------------------------------------------------------------
Andy Gross (2):
      drm/omap: Add PM capabilities
      drm/omap: Add OMAP5 support

Cong Ding (1):
      staging: omapdrm/omap_gem_dmabuf.c: fix memory leakage

Daniel Vetter (2):
      omapdrm: only take crtc->mutex in crtc callbacks
      omapdrm: simplify locking in the fb debugfs file

Peter Huewe (1):
      staging/omapdrm: Use kmemdup rather than duplicating its implementation

Rob Clark (2):
      drm/omap: move out of staging
      drm/omap: remove fbdev debug enter/leave hooks

 drivers/gpu/drm/Kconfig                            |   2 +
 drivers/gpu/drm/Makefile                           |   1 +
 drivers/{staging => gpu/drm}/omapdrm/Kconfig       |   0
 drivers/{staging => gpu/drm}/omapdrm/Makefile      |   0
 drivers/gpu/drm/omapdrm/TODO                       |  23 +++
 .../{staging => gpu/drm}/omapdrm/omap_connector.c  |   2 +-
 drivers/{staging => gpu/drm}/omapdrm/omap_crtc.c   |  14 +-
 .../{staging => gpu/drm}/omapdrm/omap_debugfs.c    |  16 +--
 .../{staging => gpu/drm}/omapdrm/omap_dmm_priv.h   |   5 +
 .../{staging => gpu/drm}/omapdrm/omap_dmm_tiler.c  | 159 +++++++++++++++------
 .../{staging => gpu/drm}/omapdrm/omap_dmm_tiler.h  |   0
 drivers/{staging => gpu/drm}/omapdrm/omap_drv.c    |  16 ++-
 drivers/{staging => gpu/drm}/omapdrm/omap_drv.h    |   8 +-
 .../{staging => gpu/drm}/omapdrm/omap_encoder.c    |   2 +-
 drivers/{staging => gpu/drm}/omapdrm/omap_fb.c     |   2 +-
 drivers/{staging => gpu/drm}/omapdrm/omap_fbdev.c  |   5 +-
 drivers/{staging => gpu/drm}/omapdrm/omap_gem.c    |  34 ++++-
 .../{staging => gpu/drm}/omapdrm/omap_gem_dmabuf.c |   8 +-
 .../drm}/omapdrm/omap_gem_helpers.c                |   2 +-
 drivers/{staging => gpu/drm}/omapdrm/omap_irq.c    |   2 +-
 drivers/{staging => gpu/drm}/omapdrm/omap_plane.c  |   2 +-
 drivers/{staging => gpu/drm}/omapdrm/tcm-sita.c    |   0
 drivers/{staging => gpu/drm}/omapdrm/tcm-sita.h    |   0
 drivers/{staging => gpu/drm}/omapdrm/tcm.h         |   2 +
 drivers/staging/Kconfig                            |   2 -
 drivers/staging/Makefile                           |   1 -
 drivers/staging/omapdrm/TODO                       |  32 -----
 .../omapdrm => include/uapi/drm}/omap_drm.h        |   2 +-
 28 files changed, 220 insertions(+), 122 deletions(-)
 rename drivers/{staging => gpu/drm}/omapdrm/Kconfig (100%)
 rename drivers/{staging => gpu/drm}/omapdrm/Makefile (100%)
 create mode 100644 drivers/gpu/drm/omapdrm/TODO
 rename drivers/{staging => gpu/drm}/omapdrm/omap_connector.c (99%)
 rename drivers/{staging => gpu/drm}/omapdrm/omap_crtc.c (98%)
 rename drivers/{staging => gpu/drm}/omapdrm/omap_debugfs.c (90%)
 rename drivers/{staging => gpu/drm}/omapdrm/omap_dmm_priv.h (96%)
 rename drivers/{staging => gpu/drm}/omapdrm/omap_dmm_tiler.c (86%)
 rename drivers/{staging => gpu/drm}/omapdrm/omap_dmm_tiler.h (100%)
 rename drivers/{staging => gpu/drm}/omapdrm/omap_drv.c (97%)
 rename drivers/{staging => gpu/drm}/omapdrm/omap_drv.h (98%)
 rename drivers/{staging => gpu/drm}/omapdrm/omap_encoder.c (99%)
 rename drivers/{staging => gpu/drm}/omapdrm/omap_fb.c (99%)
 rename drivers/{staging => gpu/drm}/omapdrm/omap_fbdev.c (98%)
 rename drivers/{staging => gpu/drm}/omapdrm/omap_gem.c (97%)
 rename drivers/{staging => gpu/drm}/omapdrm/omap_gem_dmabuf.c (98%)
 rename drivers/{staging => gpu/drm}/omapdrm/omap_gem_helpers.c (98%)
 rename drivers/{staging => gpu/drm}/omapdrm/omap_irq.c (99%)
 rename drivers/{staging => gpu/drm}/omapdrm/omap_plane.c (99%)
 rename drivers/{staging => gpu/drm}/omapdrm/tcm-sita.c (100%)
 rename drivers/{staging => gpu/drm}/omapdrm/tcm-sita.h (100%)
 rename drivers/{staging => gpu/drm}/omapdrm/tcm.h (99%)
 delete mode 100644 drivers/staging/omapdrm/TODO
 rename {drivers/staging/omapdrm => include/uapi/drm}/omap_drm.h (99%)


More information about the dri-devel mailing list