From: Dave Airlie <airlied@redhat.com>
Date: Fri, 24 Jul 2015 04:28:16 +0000 (+1000)
Subject: Merge tag 'topic/drm-misc-2015-07-23' of git://anongit.freedesktop.org/drm-intel... 
X-Git-Tag: firefly_0821_release~176^2~1083^2~41
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fa78ceab99e4481e17ab6b6a88257c1c7c23d55a;p=firefly-linux-kernel-4.4.55.git

Merge tag 'topic/drm-misc-2015-07-23' of git://anongit.freedesktop.org/drm-intel into drm-next

Update drm-misc pull request since the first one didn't go in yet. Few
atomic helper patches, rejecting some old dri1 crap for modern drivers and
a few trivial things on top.

* tag 'topic/drm-misc-2015-07-23' of git://anongit.freedesktop.org/drm-intel:
  drm/mgag200: remove unneeded variable
  drm/mgag200: remove unused variables
  drm/atomic: Only update crtc->x/y if it's part of the state, v2.
  drm/fb: drop panic handling
  drm: Fix warning with make xmldocs caused by drm_irq.c
  drm/gem: rip out drm vma accounting for gem mmaps
  drm/fourcc: Add formats R8, RG88, GR88
  drm/atomic: Cleanup on error properly in the atomic ioctl.
  drm: Update plane->fb also for page_flip
  drm: remove redundant code form drm_ioc32.c
  drm: reset empty state in transitional helpers
  drm/crtc-helper: Fixup error handling in drm_helper_crtc_mode_set
  drm/atomic: Update old_fb after setting a property.
  drm: Remove useless blank line
  drm: Reject DRI1 hw lock ioctl functions for kms drivers
  drm: Convert drm_legacy_ctxbitmap_init to void return type
  drm: Turn off Legacy Context Functions
---

fa78ceab99e4481e17ab6b6a88257c1c7c23d55a