drm/i915: Zap call to drm_plane_helper_disable, v2.
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Mon, 1 Jun 2015 10:49:58 +0000 (12:49 +0200)
committerJani Nikula <jani.nikula@intel.com>
Fri, 12 Jun 2015 10:19:33 +0000 (13:19 +0300)
The primary plane can still be configured when crtc is off,
furthermore this is also a noop now that affected planes are
added on modesets.

Changes since v1:
- Move commit so no frontbuffer_bits warnings are generated.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/intel_display.c

index e566515e27ca12d32bd9128fa212ab5547a15d17..dcd256f47fe50e9b54b3d928c961aa928f42bc94 100644 (file)
@@ -12938,8 +12938,6 @@ static int __intel_set_mode(struct drm_atomic_state *state)
 
                intel_crtc_disable_planes(crtc);
                dev_priv->display.crtc_disable(crtc);
-               if (!crtc_state->enable)
-                       drm_plane_helper_disable(crtc->primary);
        }
 
        /* Only after disabling all output pipelines that will be changed can we