drm/i915: Add primary plane to mask if it's visible
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Tue, 15 Sep 2015 12:28:54 +0000 (14:28 +0200)
committerJani Nikula <jani.nikula@intel.com>
Wed, 23 Sep 2015 10:18:26 +0000 (13:18 +0300)
commit721a09f7393de6c28a07516dccd654c6e995944a
tree5a90bd4301532b6c4edf15e0d6b398fcce82ec68
parent41b578fb0e8b930f2470d3f673b0fa279e77a7b8
drm/i915: Add primary plane to mask if it's visible

This fixes the warnings like

"plane A assertion failure, should be disabled but not"

that on the initial modeset during boot. This can happen if
the primary plane is enabled by the firmware, but inheriting
it fails because the DMAR is active or for other reasons.

Most likely caused by

commit 36750f284b3a4f19b304fda1bb7d6e9e1275ea8d
Author: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Date:   Mon Jun 1 12:49:54 2015 +0200

    drm/i915: update plane state during init

Reported-by: Andreas Reis <andreas.reis@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91429
Reported-and-tested-by: Emil Renner Berthing <kernel@esmil.dk>
Tested-by: Andreas Reis <andreas.reis@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/intel_display.c