From: Dave Airlie Date: Fri, 20 Mar 2015 07:32:21 +0000 (+1000) Subject: Merge tag 'drm-intel-fixes-2015-03-19' of git://anongit.freedesktop.org/drm-intel... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8265d4486d5c2448a1c645fdc20d4e62873d9c3d;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge tag 'drm-intel-fixes-2015-03-19' of git://anongit.freedesktop.org/drm-intel into drm-fixes Backporting a couple of plane related fixes from drm-next to v4.0. * tag 'drm-intel-fixes-2015-03-19' of git://anongit.freedesktop.org/drm-intel: drm/i915: Make sure the primary plane is enabled before reading out the fb state drm/i915: Ensure plane->state->fb stays in sync with plane->fb --- 8265d4486d5c2448a1c645fdc20d4e62873d9c3d