drm/i915: Make g4x_fixup_plane() operational again
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Fri, 7 Jun 2013 15:52:24 +0000 (18:52 +0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 7 Jun 2013 16:00:04 +0000 (18:00 +0200)
commit22e407d749a418b4bb4cc93ef76e0429a9f83c82
tree97dc1b813f02edea80caada5586c12eff5838d24
parentfd3da6c95b6d865446fa9b29df6edff4343e385a
drm/i915: Make g4x_fixup_plane() operational again

Don't enable the cursor until g4x_fixup_plane() had a chance to do
cast its magic spell.

Egbert writes:
"Today I had the chance to test this. First I tried
 if I can still reproduce the blank with this patch
 added when I disable my voodoo g4x_fixup_plane():
 It turned out it still happens however very rarely
 (like 1 out of 20 tries). When I reenabled my voodoo
 the issue still occurred.
 I had to switch two lines around, ie:

         intel_enable_plane(dev_priv, plane, pipe);
         if (IS_G4X(dev))
                 g4x_fixup_plane(dev_priv, pipe);
 +       intel_crtc_update_cursor(crtc, true);

 to avoid the blank screen issue - which is it didn't
 happen in ~75 tries."

v2: Add a comment to remind people of the ordering constraints

Acked-by: Egbert Eich <eich@suse.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c