drm/i915: Fix assert_plane warning during FDI link train
Subsystems (2)
PATCH 1/1 drm/i915: Fix assert_plane warning during FDI link train
From: Ville Syrjälä <[email protected]>
assert_plane_enabled() is now triggering during FDI link train because we no longer enable planes that early.
This problem got introduced in:
commit a5c4d7bc187bd13bc11ac06bb4ea3a0d4001aa4d
Author: Ville Syrjälä <[email protected]>
Date: Fri Mar 7 18:32:13 2014 +0200
drm/i915: Disable/enable planes as the first/last thing during modeset on ILK+
Just drop the assert since we shouldn't need planes for link training.
--- drivers/gpu/drm/i915/intel_display.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +1 -2
@@ -2602,9 +2602,8 @@ static void ironlake_fdi_link_train(struct drm_crtc *crtc)int plane = intel_crtc->plane;u32 reg, temp, tries; -/* FDI needs bits from pipe & plane first */ +/* FDI needs bits from pipe first */ assert_pipe_enabled (dev_priv, pipe); -assert_plane_enabled (dev_priv, plane);/* Train 1: umask FDI RX Interrupt symbol_lock and bit_lock bit for train result */
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter
AppliedQuoted 10 lines · On Fri, Apr 25, 2014 at 10:12:07PM +0300, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
assert_plane_enabled()is now triggering during FDI link train because we no longer enable planes that early.This problem got introduced in:
commita5c4d7bc187bd13bc11ac06bb4ea3a0d4001aa4d
Author: Ville Syrjälä <[email protected]>
Date: Fri Mar 7 18:32:13 2014 +0200
Quoted 5 lines
drm/i915: Disable/enable planes as the first/last thing during modeset on ILK+
Just drop the assert since we shouldn't need planes for link training.
Signed-off-by Ville Syrjälä <[email protected]>
Queued for -next, thanks for the patch. I've spotted this in a QA report, but afaik they didn't yet file a bug report.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch