Revert "drm/i915: Add primary plane to mask if it's visible"
authorJani Nikula <jani.nikula@intel.com>
Wed, 14 Oct 2015 08:29:01 +0000 (11:29 +0300)
committerJani Nikula <jani.nikula@intel.com>
Wed, 14 Oct 2015 10:41:24 +0000 (13:41 +0300)
commit2e2edebefceef201624dcc323a1f7761e0040cf5
treee777eb7a3562691a385ccf70eb0cd50fcaddea8b
parentcc917ab43541db3ff66d0136042686d40a1b4c9a
Revert "drm/i915: Add primary plane to mask if it's visible"

This reverts commit 721a09f7393de6c28a07516dccd654c6e995944a.

There is nothing wrong with the commit per se. We had two versions of
the commit, one in -next headed for v4.4 and this one for v4.3. Turns
out we'll need to backport more fixes from -next, and they conflict with
the v4.3 version. It gets messy. It will be easiest to revert this one,
and backport all the relevant commits from -next without modifications;
they apply cleanly after this revert.

Requested-by: Joseph Yasi <joe.yasi@gmail.com>
References: https://bugs.freedesktop.org/show_bug.cgi?id=91910#c4
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Acked-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/intel_display.c