Commit 9c8958bc authored by Daniel Vetter's avatar Daniel Vetter

drm/i915: Track the primary plane correctly when reassigning planes

commit 98ec7739
Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date:   Wed Apr 30 17:43:01 2014 +0300

    drm/i915: Make primary_enabled match the actual hardware state

introduced more accurate tracking of the primary plane and some
checks. It missed the plane->pipe reassignement code for gen2/3
though, which the checks caught and resulted in WARNING backtraces.

Since we only use this path if the plane is on and on the wrong pipe
we can just always set the tracking bit to "enabled".
Reported-and-tested-by: default avatarPaul Bolle <pebolle@tiscali.nl>
Cc: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 724cb06f
...@@ -11914,6 +11914,7 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc) ...@@ -11914,6 +11914,7 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc)
* ... */ * ... */
plane = crtc->plane; plane = crtc->plane;
crtc->plane = !plane; crtc->plane = !plane;
crtc->primary_enabled = true;
dev_priv->display.crtc_disable(&crtc->base); dev_priv->display.crtc_disable(&crtc->base);
crtc->plane = plane; crtc->plane = plane;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment