Merge tag 'drm-intel-fixes-2015-03-26' of git://anongit.freedesktop.org/drm-intel...
authorDave Airlie <airlied@redhat.com>
Thu, 26 Mar 2015 21:39:45 +0000 (07:39 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 26 Mar 2015 21:39:45 +0000 (07:39 +1000)
commit9822393d23ba9129396ab9308dbb8ce10ae74751
tree7fc4ca225d5bd570d2e21a4e0fab5d9851da7fa1
parent59a58cb34d3fe73e6c899cc5d9a87428ca662925
parent5f407751b0ca9bd876fe8f15ff28153661c6ba0a
Merge tag 'drm-intel-fixes-2015-03-26' of git://anongit.freedesktop.org/drm-intel into drm-fixes

This should cover the final warnings in -rc5 with two more backports
from our development branch (drm-intel-next-queued). They're the ones
from Daniel and Damien, with references to the reports.

This is on top of drm-fixes because of the dependency on the two earlier
fixes not yet in Linus' tree.

There's an additional regression fix from Chris.

* tag 'drm-intel-fixes-2015-03-26' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: Fixup legacy plane->crtc link for initial fb config
  drm/i915: Fix atomic state when reusing the firmware fb
  drm/i915: Keep ring->active_list and ring->requests_list consistent