On Wed, Sep 04, 2013 at 02:20:09PM +0300, Jani Nikula wrote: > The cursor is disabled before crtc mode set in crtc disable (and we > assert this is the case), and enabled afterwards in crtc enable. Do not > update it in crtc mode set. > > Suggested-by: Ville Syrjälä <[email protected]> > Signed-off-by: Jani Nikula <[email protected]>
Reviewed-by: Ville Syrjälä <[email protected]> > --- > drivers/gpu/drm/i915/intel_display.c | 9 --------- > 1 file changed, 9 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c > b/drivers/gpu/drm/i915/intel_display.c > index 89243cc..4939683 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -4910,9 +4910,6 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc, > } > } > > - /* Ensure that the cursor is valid for the new mode before changing... > */ > - intel_crtc_update_cursor(crtc, true); > - > if (!is_dsi && is_lvds && dev_priv->lvds_downclock_avail) { > /* > * Ensure we match the reduced clock's P to the target clock. > @@ -5806,9 +5803,6 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc, > intel_crtc->config.dpll.p2 = clock.p2; > } > > - /* Ensure that the cursor is valid for the new mode before changing... > */ > - intel_crtc_update_cursor(crtc, true); > - > /* CPU eDP is the only output that doesn't need a PCH PLL of its own. */ > if (intel_crtc->config.has_pch_encoder) { > fp = i9xx_dpll_compute_fp(&intel_crtc->config.dpll); > @@ -6299,9 +6293,6 @@ static int haswell_crtc_mode_set(struct drm_crtc *crtc, > if (!intel_ddi_pll_mode_set(crtc)) > return -EINVAL; > > - /* Ensure that the cursor is valid for the new mode before changing... > */ > - intel_crtc_update_cursor(crtc, true); > - > if (intel_crtc->config.has_dp_encoder) > intel_dp_set_m_n(intel_crtc); > > -- > 1.7.9.5 -- Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
