]> git.karo-electronics.de Git - karo-tx-linux.git/commit
drm/i915: Fix assert_plane warning during FDI link train
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Fri, 25 Apr 2014 19:12:07 +0000 (22:12 +0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 30 Apr 2014 08:05:53 +0000 (10:05 +0200)
commitc90e394fc5fb0c5361c3725e25f2a8aec393abac
tree3daef88b5a39708f0609169a9d8150792ef0f0ee
parentdcfce6cafbb1e2afb16792f2834d9924924c2228
drm/i915: Fix assert_plane warning during FDI link train

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ä <ville.syrjala@linux.intel.com>
 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.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
[danvet: Squash in fixup for now unused plane local variable, reported
by 0-day tester.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c