]> Pileus Git - ~andy/linux/commit
Merge branch 'gma500-next' of git://github.com/patjak/drm-gma500 into drm-next
authorDave Airlie <airlied@redhat.com>
Thu, 22 Aug 2013 00:38:28 +0000 (10:38 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 22 Aug 2013 00:38:28 +0000 (10:38 +1000)
commit291d284c6004e3a63d0c2f6c31570ab2126843a8
treefb38da263bfd8d76ffe440f4ac9549ee53acd893
parentd0b2c5334f41bdd18adaa3fbc1f7b5f1daab7eac
parent75346fe9bc4c9b366c760200a665a2c55b789389
Merge branch 'gma500-next' of git://github.com/patjak/drm-gma500 into drm-next

Here's some gma500 unifying and cleanups for drm-next. There is more stuff in
the pipe for 3.12 but I'd like to get these out of the way first.

* 'gma500-next' of git://github.com/patjak/drm-gma500: (35 commits)
  drm/gma500/cdv: Add and hook up chip op for disabling sr
  drm/gma500/cdv: Add and hook up chip op for watermarks
  drm/gma500: Rename psb_intel_encoder to gma_encoder
  drm/gma500: Rename psb_intel_connector to gma_connector
  drm/gma500: Rename psb_intel_crtc to gma_crtc
  drm/gma500/cdv: Convert to generic set_config()
  drm/gma500/psb: Convert to generic set_config()
  drm/gma500: Add generic set_config() function
  drm/gma500/cdv: Convert to generic save/restore
  drm/gma500/psb: Convert to generic save/restore
  drm/gma500: Add generic crtc save/restore funcs
  drm/gma500: Convert to generic encoder funcs
  drm/gma500: Add generic encoder functions
  drm/gma500/psb: Convert to generic cursor funcs
  drm/gma500/cdv: Convert to generic cursor funcs
  drm/gma500: Add generic cursor functions
  drm/gma500/psb: Convert to generic crtc->destroy
  drm/gma500/mdfld: Use identical generic crtc funcs
  drm/gma500/oak: Use identical generic crtc funcs
  drm/gma500/psb: Convert to gma_crtc_dpms()
  ...
drivers/gpu/drm/gma500/psb_drv.c
drivers/gpu/drm/gma500/psb_drv.h