linux/drivers/staging/omapdrm
Linus Torvalds bd22dc17e4 Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
Pull drm updates from Dave Airlie:
 "One of the smaller drm -next pulls in ages!

  Ben (nouveau) has a rewrite in progress but we decided to leave it
  stew for another cycle, so just some fixes from him.

   - radeon: lots of documentation work, fixes, more ring and locking
     changes, pcie gen2, more dp fixes.
   - i915: haswell features, gpu reset fixes, /dev/agpgart removal on
     machines that we never used it on, more VGA/HDP fix., more DP fixes
   - drm core: cleanups from Daniel, sis 64-bit fixes, range allocator
     colouring.

  but yeah fairly quiet merge this time, probably because I missed half
  of it!"

Trivial add-add conflict in include/linux/pci_regs.h

* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (255 commits)
  drm/nouveau: init vblank requests list
  drm/nv50: extend vblank semaphore to generic dmaobj + offset pair
  drm/nouveau: mark most of our ioctls as deprecated, move to compat layer
  drm/nouveau: move current gpuobj code out of nouveau_object.c
  drm/nouveau/gem: fix object reference leak in a failure path
  drm/nv50: rename INVALID_QUERY_OR_TEXTURE error to INVALID_OPERATION
  drm/nv84: decode PCRYPT errors
  drm/nouveau: dcb table quirk for fdo#50830
  nouveau: Fix alignment requirements on src and dst addresses
  drm/i915: unbreak lastclose for failed driver init
  drm/i915: Set the context before setting up regs for the context.
  drm/i915: constify mode in crtc_mode_fixup
  drm/i915/lvds: ditch ->prepare special case
  drm/i915: dereferencing an error pointer
  drm/i915: fix invalid reference handling of the default ctx obj
  drm/i915: Add -EIO to the list of known errors for __wait_seqno
  drm/i915: Flush the context object from the CPU caches upon switching
  drm/radeon: fix dpms on/off on trinity/aruba v2
  drm/radeon: on hotplug force link training to happen (v2)
  drm/radeon: fix hotplug of DP to DVI|HDMI passive adapters (v2)
  ...
2012-07-26 14:18:18 -07:00
..
Kconfig
Makefile staging: drm/omap: dmabuf/prime support 2012-04-10 11:25:59 -07:00
TODO staging: drm/omap: update TODO 2012-07-06 16:11:44 -07:00
omap_connector.c
omap_crtc.c drm: Make the .mode_fixup() operations mode argument a const pointer 2012-07-19 21:52:38 -04:00
omap_debugfs.c staging: drm/omap: Disable DMM debugfs for OMAP3 2012-03-07 13:38:07 -08:00
omap_dmm_priv.h staging: omapdrm: Fix error paths during dmm init 2012-06-11 08:43:19 -07:00
omap_dmm_tiler.c staging: omapdrm: Fix error paths during dmm init 2012-06-11 08:43:19 -07:00
omap_dmm_tiler.h staging: drm/omap: Get DMM resources from hwmod 2012-03-07 13:38:08 -08:00
omap_drm.h
omap_drv.c Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux 2012-05-24 12:42:54 -07:00
omap_drv.h omap2+: add drm device 2012-07-02 04:05:57 -07:00
omap_encoder.c drm: Make the .mode_fixup() operations mode argument a const pointer 2012-07-19 21:52:38 -04:00
omap_fb.c staging: drm/omap: dmabuf/prime mmap support 2012-05-17 08:54:08 -07:00
omap_fbdev.c staging: omapdrm: fix crash when freeing bad fb 2012-06-11 08:42:09 -07:00
omap_gem.c staging: drm/omap: dmabuf/prime mmap support 2012-05-17 08:54:08 -07:00
omap_gem_dmabuf.c staging: drm/omap: initial dmabuf/prime import support 2012-05-17 08:54:09 -07:00
omap_gem_helpers.c staging: drm/omap: Use ERR_CAST inlined function instead of ERR_PTR(PTR_ERR(.. 2012-02-09 09:41:34 -08:00
omap_plane.c staging: drm/omap: send page-flip event after endwin 2012-03-13 15:44:44 -07:00
tcm-sita.c staging:omapdrm Fix typos in drivers:omapdrm 2012-04-10 10:31:01 -07:00
tcm-sita.h
tcm.h