Merge branch 'omapdrm-next' of git://people.freedesktop.org/~robclark/linux into drm-next

Browse source

* 'omapdrm-next' of git://people.freedesktop.org/~robclark/linux:
  drm/omap: remove fbdev debug enter/leave hooks
  omapdrm: simplify locking in the fb debugfs file
  omapdrm: only take crtc->mutex in crtc callbacks
  drm/omap: move out of staging
  staging/omapdrm: Use kmemdup rather than duplicating its implementation
  staging: omapdrm/omap_gem_dmabuf.c: fix memory leakage
  drm/omap: Add OMAP5 support
  drm/omap: Add PM capabilities

...

This commit is contained in:

Dave Airlie 2013-02-19 12:01:55 +10:00

parent 3314fdf8b4 8e44770f09

commit 8e26875e21

50 changed files with 8385 additions and 8287 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/gpu/drm/Kconfig

View file

1

drivers/gpu/drm/Makefile

View file

0

drivers/staging/omapdrm/Kconfig → drivers/gpu/drm/omapdrm/Kconfig

View file

0

drivers/staging/omapdrm/Makefile → drivers/gpu/drm/omapdrm/Makefile

View file

23

drivers/gpu/drm/omapdrm/TODO

View file

2

drivers/staging/omapdrm/omap_connector.c → drivers/gpu/drm/omapdrm/omap_connector.c

View file

14

drivers/staging/omapdrm/omap_crtc.c → drivers/gpu/drm/omapdrm/omap_crtc.c

View file

16

drivers/staging/omapdrm/omap_debugfs.c → drivers/gpu/drm/omapdrm/omap_debugfs.c

View file

5

drivers/staging/omapdrm/omap_dmm_priv.h → drivers/gpu/drm/omapdrm/omap_dmm_priv.h

View file

163

drivers/staging/omapdrm/omap_dmm_tiler.c → drivers/gpu/drm/omapdrm/omap_dmm_tiler.c

View file

0

drivers/staging/omapdrm/omap_dmm_tiler.h → drivers/gpu/drm/omapdrm/omap_dmm_tiler.h

View file

16

drivers/staging/omapdrm/omap_drv.c → drivers/gpu/drm/omapdrm/omap_drv.c

View file

8

drivers/staging/omapdrm/omap_drv.h → drivers/gpu/drm/omapdrm/omap_drv.h

View file

2

drivers/staging/omapdrm/omap_encoder.c → drivers/gpu/drm/omapdrm/omap_encoder.c

View file

2

drivers/staging/omapdrm/omap_fb.c → drivers/gpu/drm/omapdrm/omap_fb.c

View file

5

drivers/staging/omapdrm/omap_fbdev.c → drivers/gpu/drm/omapdrm/omap_fbdev.c

View file

34

drivers/staging/omapdrm/omap_gem.c → drivers/gpu/drm/omapdrm/omap_gem.c

View file

8

drivers/staging/omapdrm/omap_gem_dmabuf.c → drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c

View file

2

drivers/staging/omapdrm/omap_gem_helpers.c → drivers/gpu/drm/omapdrm/omap_gem_helpers.c

View file

2

drivers/staging/omapdrm/omap_irq.c → drivers/gpu/drm/omapdrm/omap_irq.c

View file

2

drivers/staging/omapdrm/omap_plane.c → drivers/gpu/drm/omapdrm/omap_plane.c

View file

0

drivers/staging/omapdrm/tcm-sita.c → drivers/gpu/drm/omapdrm/tcm-sita.c

View file

0

drivers/staging/omapdrm/tcm-sita.h → drivers/gpu/drm/omapdrm/tcm-sita.h

View file

2

drivers/staging/omapdrm/tcm.h → drivers/gpu/drm/omapdrm/tcm.h

View file

2

drivers/staging/Kconfig

View file

1

drivers/staging/Makefile

View file

32

drivers/staging/omapdrm/TODO

View file

2

drivers/staging/omapdrm/omap_drm.h → include/uapi/drm/omap_drm.h

View file