@@ -3132,7 +3132,8 @@ static int ilk_update_sprite_wm(struct drm_plane *plane,
* primary only and sprite only configurations. Otherwise the screen
* flashes black. No underrun reported though.
*/
- if (IS_IVYBRIDGE(dev) && config->spr.scaled && ilk_disable_lp_wm(crtc))
+ if (IS_IVYBRIDGE(dev) && !params.spr.scaled &&
+ config->spr.scaled && ilk_disable_lp_wm(crtc))
intel_wait_for_vblank(dev, to_intel_plane(plane)->pipe);
else if (config->pri.enabled != config->spr.enabled &&
config->pri.enabled != params.pri.enabled &&