On Tue, Nov 08, 2016 at 01:55:40PM +0100, Maarten Lankhorst wrote: > All of this state should be updated as soon as possible. It shouldn't be > done later because then future updates may not depend on it. > > Changes since v1: > - Move the modeset update to before drm_atomic_state_get. (Ville) > > Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrj...@linux.intel.com> > --- > drivers/gpu/drm/i915/intel_display.c | 15 ++++++++------- > 1 file changed, 8 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c > b/drivers/gpu/drm/i915/intel_display.c > index e59adb03933e..d368afa199e3 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -14353,14 +14353,8 @@ static void intel_atomic_commit_tail(struct > drm_atomic_state *state) > > drm_atomic_helper_wait_for_dependencies(state); > > - if (intel_state->modeset) { > - memcpy(dev_priv->min_pixclk, intel_state->min_pixclk, > - sizeof(intel_state->min_pixclk)); > - dev_priv->active_crtcs = intel_state->active_crtcs; > - dev_priv->atomic_cdclk_freq = intel_state->cdclk; > - > + if (intel_state->modeset) > intel_display_power_get(dev_priv, POWER_DOMAIN_MODESET); > - } > > for_each_crtc_in_state(state, crtc, old_crtc_state, i) { > struct intel_crtc *intel_crtc = to_intel_crtc(crtc); > @@ -14601,6 +14595,13 @@ static int intel_atomic_commit(struct drm_device > *dev, > intel_shared_dpll_commit(state); > intel_atomic_track_fbs(state); > > + if (intel_state->modeset) { > + memcpy(dev_priv->min_pixclk, intel_state->min_pixclk, > + sizeof(intel_state->min_pixclk)); > + dev_priv->active_crtcs = intel_state->active_crtcs; > + dev_priv->atomic_cdclk_freq = intel_state->cdclk; > + } > + > drm_atomic_state_get(state); > INIT_WORK(&state->commit_work, > nonblock ? intel_atomic_commit_work : NULL); > -- > 2.7.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx