From: Dave Airlie Date: Thu, 26 Mar 2015 21:39:45 +0000 (+1000) Subject: Merge tag 'drm-intel-fixes-2015-03-26' of git://anongit.freedesktop.org/drm-intel... X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=9822393d23ba9129396ab9308dbb8ce10ae74751;p=deliverable%2Flinux.git 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 --- 9822393d23ba9129396ab9308dbb8ce10ae74751