On Mon, Oct 17, 2016 at 02:37:17PM +0200, Maarten Lankhorst wrote:
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 156
> ++++++++++++++++++-----------------
> 1 file changed, 80 insertions(+), 76 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c
> b/drivers/gpu/drm/i915/intel_display.c
> index 3bd3f6a93c12..d310abace86a 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -3510,7 +3510,12 @@ __intel_display_resume(struct drm_device *dev,
> if (!state)
> return 0;
>
> - for_each_crtc_in_state(state, crtc, crtc_state, i) {
> + /*
> + * We've duplicated the state, pointers to the old state are invalid.
> + *
> + * Don't attempt to use the old state until we commit the duplicated
> state.
> + */
> + for_each_new_crtc_in_state(state, crtc, crtc_state, i) {
> /*
> * Force recalculation even if we restore
> * current state. With fast modeset this may not result
> @@ -5078,13 +5083,12 @@ static void intel_post_plane_update(struct
> intel_crtc_state *old_crtc_state)
> }
> }
>
> -static void intel_pre_plane_update(struct intel_crtc_state *old_crtc_state)
> +static void intel_pre_plane_update(struct intel_crtc_state *old_crtc_state,
> + struct intel_crtc_state *pipe_config)
> {
> struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->base.crtc);
> struct drm_device *dev = crtc->base.dev;
> struct drm_i915_private *dev_priv = to_i915(dev);
> - struct intel_crtc_state *pipe_config =
> - to_intel_crtc_state(crtc->base.state);
> struct drm_atomic_state *old_state = old_crtc_state->base.state;
> struct drm_plane *primary = crtc->base.primary;
> struct drm_plane_state *old_pri_state =
> @@ -5186,12 +5190,11 @@ static void intel_encoders_pre_pll_enable(struct
> drm_crtc *crtc,
> struct intel_crtc_state *crtc_state,
> struct drm_atomic_state *old_state)
> {
> - struct drm_connector_state *old_conn_state;
> + struct drm_connector_state *conn_state;
> struct drm_connector *conn;
> int i;
>
> - for_each_connector_in_state(old_state, conn, old_conn_state, i) {
> - struct drm_connector_state *conn_state = conn->state;
> + for_each_new_connector_in_state(old_state, conn, conn_state, i) {
> struct intel_encoder *encoder =
> to_intel_encoder(conn_state->best_encoder);
>
> @@ -5207,12 +5210,11 @@ static void intel_encoders_pre_enable(struct drm_crtc
> *crtc,
> struct intel_crtc_state *crtc_state,
> struct drm_atomic_state *old_state)
> {
> - struct drm_connector_state *old_conn_state;
> + struct drm_connector_state *conn_state;
> struct drm_connector *conn;
> int i;
>
> - for_each_connector_in_state(old_state, conn, old_conn_state, i) {
> - struct drm_connector_state *conn_state = conn->state;
> + for_each_new_connector_in_state(old_state, conn, conn_state, i) {
> struct intel_encoder *encoder =
> to_intel_encoder(conn_state->best_encoder);
>
> @@ -5228,12 +5230,11 @@ static void intel_encoders_enable(struct drm_crtc
> *crtc,
> struct intel_crtc_state *crtc_state,
> struct drm_atomic_state *old_state)
> {
> - struct drm_connector_state *old_conn_state;
> + struct drm_connector_state *conn_state;
> struct drm_connector *conn;
> int i;
>
> - for_each_connector_in_state(old_state, conn, old_conn_state, i) {
> - struct drm_connector_state *conn_state = conn->state;
> + for_each_new_connector_in_state(old_state, conn, conn_state, i) {
> struct intel_encoder *encoder =
> to_intel_encoder(conn_state->best_encoder);
>
> @@ -5253,7 +5254,7 @@ static void intel_encoders_disable(struct drm_crtc
> *crtc,
> struct drm_connector *conn;
> int i;
>
> - for_each_connector_in_state(old_state, conn, old_conn_state, i) {
> + for_each_old_connector_in_state(old_state, conn, old_conn_state, i) {
> struct intel_encoder *encoder =
> to_intel_encoder(old_conn_state->best_encoder);
>
> @@ -5273,7 +5274,7 @@ static void intel_encoders_post_disable(struct drm_crtc
> *crtc,
> struct drm_connector *conn;
> int i;
>
> - for_each_connector_in_state(old_state, conn, old_conn_state, i) {
> + for_each_old_connector_in_state(old_state, conn, old_conn_state, i) {
> struct intel_encoder *encoder =
> to_intel_encoder(old_conn_state->best_encoder);
>
> @@ -5293,7 +5294,7 @@ static void intel_encoders_post_pll_disable(struct
> drm_crtc *crtc,
> struct drm_connector *conn;
> int i;
>
> - for_each_connector_in_state(old_state, conn, old_conn_state, i) {
> + for_each_old_connector_in_state(old_state, conn, old_conn_state, i) {
> struct intel_encoder *encoder =
> to_intel_encoder(old_conn_state->best_encoder);
>
> @@ -6573,7 +6574,7 @@ static int intel_mode_max_pixclk(struct drm_device *dev,
> memcpy(intel_state->min_pixclk, dev_priv->min_pixclk,
> sizeof(intel_state->min_pixclk));
>
> - for_each_crtc_in_state(state, crtc, crtc_state, i) {
> + for_each_new_crtc_in_state(state, crtc, crtc_state, i) {
> int pixclk = 0;
>
> if (crtc_state->enable)
> @@ -10238,7 +10239,7 @@ static int ilk_max_pixel_rate(struct drm_atomic_state
> *state)
> memcpy(intel_state->min_pixclk, dev_priv->min_pixclk,
> sizeof(intel_state->min_pixclk));
>
> - for_each_crtc_in_state(state, crtc, cstate, i) {
> + for_each_new_crtc_in_state(state, crtc, cstate, i) {
> int pixel_rate;
>
> crtc_state = to_intel_crtc_state(cstate);
> @@ -12530,7 +12531,7 @@ static bool check_single_encoder_cloning(struct
> drm_atomic_state *state,
> struct drm_connector_state *connector_state;
> int i;
>
> - for_each_connector_in_state(state, connector, connector_state, i) {
> + for_each_new_connector_in_state(state, connector, connector_state, i) {
> if (connector_state->crtc != &crtc->base)
> continue;
>
> @@ -12700,7 +12701,7 @@ compute_baseline_pipe_bpp(struct intel_crtc *crtc,
> state = pipe_config->base.state;
>
> /* Clamp display bpp to EDID value */
> - for_each_connector_in_state(state, connector, connector_state, i) {
> + for_each_new_connector_in_state(state, connector, connector_state, i) {
> if (connector_state->crtc != &crtc->base)
> continue;
>
> @@ -12992,7 +12993,7 @@ intel_modeset_pipe_config(struct drm_crtc *crtc,
> &pipe_config->pipe_src_w,
> &pipe_config->pipe_src_h);
>
> - for_each_connector_in_state(state, connector, connector_state, i) {
> + for_each_new_connector_in_state(state, connector, connector_state, i) {
> if (connector_state->crtc != crtc)
> continue;
>
> @@ -13023,7 +13024,7 @@ encoder_retry:
> * adjust it according to limitations or connector properties, and also
> * a chance to reject the mode entirely.
> */
> - for_each_connector_in_state(state, connector, connector_state, i) {
> + for_each_new_connector_in_state(state, connector, connector_state, i) {
> if (connector_state->crtc != crtc)
> continue;
>
> @@ -13072,16 +13073,16 @@ static void
> intel_modeset_update_crtc_state(struct drm_atomic_state *state)
> {
> struct drm_crtc *crtc;
> - struct drm_crtc_state *crtc_state;
> + struct drm_crtc_state *new_crtc_state;
> int i;
>
> /* Double check state. */
> - for_each_crtc_in_state(state, crtc, crtc_state, i) {
> - to_intel_crtc(crtc)->config = to_intel_crtc_state(crtc->state);
> + for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) {
> + to_intel_crtc(crtc)->config =
> to_intel_crtc_state(new_crtc_state);
>
> /* Update hwmode for vblank functions */
> - if (crtc->state->active)
> - crtc->hwmode = crtc->state->adjusted_mode;
> + if (new_crtc_state->active)
> + crtc->hwmode = new_crtc_state->adjusted_mode;
> else
> crtc->hwmode.crtc_clock = 0;
>
There's some primary->state stuff left after this point.
> @@ -13753,21 +13754,21 @@ static void intel_modeset_clear_plls(struct
> drm_atomic_state *state)
> struct drm_i915_private *dev_priv = to_i915(dev);
> struct intel_shared_dpll_config *shared_dpll = NULL;
> struct drm_crtc *crtc;
> - struct drm_crtc_state *crtc_state;
> + struct drm_crtc_state *old_crtc_state, *new_crtc_state;
> int i;
>
> if (!dev_priv->display.crtc_compute_clock)
> return;
>
> - for_each_crtc_in_state(state, crtc, crtc_state, i) {
> + for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state,
> new_crtc_state, i) {
> struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> struct intel_shared_dpll *old_dpll =
> - to_intel_crtc_state(crtc->state)->shared_dpll;
> + to_intel_crtc_state(old_crtc_state)->shared_dpll;
>
> - if (!needs_modeset(crtc_state))
> + if (!needs_modeset(new_crtc_state))
> continue;
>
> - to_intel_crtc_state(crtc_state)->shared_dpll = NULL;
> + to_intel_crtc_state(new_crtc_state)->shared_dpll = NULL;
>
> if (!old_dpll)
> continue;
> @@ -13796,7 +13797,7 @@ static int haswell_mode_set_planes_workaround(struct
> drm_atomic_state *state)
> int i;
>
> /* look at all crtc's that are going to be enabled in during modeset */
> - for_each_crtc_in_state(state, crtc, crtc_state, i) {
> + for_each_new_crtc_in_state(state, crtc, crtc_state, i) {
> intel_crtc = to_intel_crtc(crtc);
>
> if (!crtc_state->active || !needs_modeset(crtc_state))
> @@ -13878,7 +13879,7 @@ static int intel_modeset_checks(struct
> drm_atomic_state *state)
> struct intel_atomic_state *intel_state = to_intel_atomic_state(state);
> struct drm_i915_private *dev_priv = to_i915(state->dev);
> struct drm_crtc *crtc;
> - struct drm_crtc_state *crtc_state;
> + struct drm_crtc_state *old_crtc_state, *new_crtc_state;
> int ret = 0, i;
>
> if (!check_digital_port_conflicts(state)) {
> @@ -13889,13 +13890,13 @@ static int intel_modeset_checks(struct
> drm_atomic_state *state)
> intel_state->modeset = true;
> intel_state->active_crtcs = dev_priv->active_crtcs;
>
> - for_each_crtc_in_state(state, crtc, crtc_state, i) {
> - if (crtc_state->active)
> + for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state,
> new_crtc_state, i) {
> + if (new_crtc_state->active)
> intel_state->active_crtcs |= 1 << i;
> else
> intel_state->active_crtcs &= ~(1 << i);
>
> - if (crtc_state->active != crtc->state->active)
> + if (old_crtc_state->active != new_crtc_state->active)
Almost caught me with rearragning the order ;)
> intel_state->active_pipe_changes |= drm_crtc_mask(crtc);
> }
>
> @@ -13964,7 +13965,7 @@ static int intel_atomic_check(struct drm_device *dev,
> struct drm_i915_private *dev_priv = to_i915(dev);
> struct intel_atomic_state *intel_state = to_intel_atomic_state(state);
> struct drm_crtc *crtc;
> - struct drm_crtc_state *crtc_state;
> + struct drm_crtc_state *old_crtc_state, *crtc_state;
> int ret, i;
> bool any_ms = false;
>
> @@ -13972,12 +13973,12 @@ static int intel_atomic_check(struct drm_device
> *dev,
> if (ret)
> return ret;
>
> - for_each_crtc_in_state(state, crtc, crtc_state, i) {
> + for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, crtc_state,
> i) {
> struct intel_crtc_state *pipe_config =
> to_intel_crtc_state(crtc_state);
>
> /* Catch I915_MODE_FLAG_INHERITED */
> - if (crtc_state->mode.private_flags !=
> crtc->state->mode.private_flags)
> + if (crtc_state->mode.private_flags !=
> old_crtc_state->mode.private_flags)
> crtc_state->mode_changed = true;
>
> if (!needs_modeset(crtc_state))
> @@ -14004,7 +14005,7 @@ static int intel_atomic_check(struct drm_device *dev,
>
> if (i915.fastboot &&
> intel_pipe_config_compare(dev,
> - to_intel_crtc_state(crtc->state),
> + to_intel_crtc_state(old_crtc_state),
> pipe_config, true)) {
> crtc_state->mode_changed = false;
> to_intel_crtc_state(crtc_state)->update_pipe = true;
> @@ -14049,7 +14050,7 @@ static int intel_atomic_prepare_commit(struct
> drm_device *dev,
> struct drm_crtc *crtc;
> int i, ret;
>
> - for_each_crtc_in_state(state, crtc, crtc_state, i) {
> + for_each_new_crtc_in_state(state, crtc, crtc_state, i) {
> if (state->legacy_cursor_update)
> continue;
>
> @@ -14069,7 +14070,7 @@ static int intel_atomic_prepare_commit(struct
> drm_device *dev,
> mutex_unlock(&dev->struct_mutex);
>
> if (!ret && !nonblock) {
> - for_each_plane_in_state(state, plane, plane_state, i) {
> + for_each_new_plane_in_state(state, plane, plane_state, i) {
> struct intel_plane_state *intel_plane_state =
> to_intel_plane_state(plane_state);
>
> @@ -14171,19 +14172,21 @@ static bool needs_vblank_wait(struct
> intel_crtc_state *crtc_state)
> static void intel_update_crtc(struct drm_crtc *crtc,
> struct drm_atomic_state *state,
> struct drm_crtc_state *old_crtc_state,
> + struct drm_crtc_state *new_crtc_state,
> unsigned int *crtc_vblank_mask)
> {
> struct drm_device *dev = crtc->dev;
> struct drm_i915_private *dev_priv = to_i915(dev);
> struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> - struct intel_crtc_state *pipe_config = to_intel_crtc_state(crtc->state);
> - bool modeset = needs_modeset(crtc->state);
> + struct intel_crtc_state *pipe_config =
> to_intel_crtc_state(new_crtc_state);
> + bool modeset = needs_modeset(new_crtc_state);
>
> if (modeset) {
> update_scanline_offset(intel_crtc);
> dev_priv->display.crtc_enable(pipe_config, state);
> } else {
> - intel_pre_plane_update(to_intel_crtc_state(old_crtc_state));
> + intel_pre_plane_update(to_intel_crtc_state(old_crtc_state),
> + pipe_config);
> }
>
> if (drm_atomic_get_existing_plane_state(state, crtc->primary)) {
> @@ -14202,15 +14205,15 @@ static void intel_update_crtcs(struct
> drm_atomic_state *state,
> unsigned int *crtc_vblank_mask)
> {
> struct drm_crtc *crtc;
> - struct drm_crtc_state *old_crtc_state;
> + struct drm_crtc_state *old_crtc_state, *new_crtc_state;
> int i;
>
> - for_each_crtc_in_state(state, crtc, old_crtc_state, i) {
> - if (!crtc->state->active)
> + for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state,
> new_crtc_state, i) {
> + if (!new_crtc_state->active)
> continue;
>
> intel_update_crtc(crtc, state, old_crtc_state,
> - crtc_vblank_mask);
> + new_crtc_state, crtc_vblank_mask);
> }
> }
>
> @@ -14221,7 +14224,7 @@ static void skl_update_crtcs(struct drm_atomic_state
> *state,
> struct drm_i915_private *dev_priv = to_i915(dev);
> struct intel_atomic_state *intel_state = to_intel_atomic_state(state);
> struct drm_crtc *crtc;
> - struct drm_crtc_state *old_crtc_state;
> + struct drm_crtc_state *old_crtc_state, *new_crtc_state;
> struct skl_ddb_allocation *new_ddb = &intel_state->wm_results.ddb;
> struct skl_ddb_allocation *cur_ddb = &dev_priv->wm.skl_hw.ddb;
> unsigned int updated = 0;
> @@ -14238,12 +14241,12 @@ static void skl_update_crtcs(struct
> drm_atomic_state *state,
> int i;
> progress = false;
>
> - for_each_crtc_in_state(state, crtc, old_crtc_state, i) {
> + for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state,
> new_crtc_state, i) {
> bool vbl_wait = false;
> unsigned int cmask = drm_crtc_mask(crtc);
> pipe = to_intel_crtc(crtc)->pipe;
>
> - if (updated & cmask || !crtc->state->active)
> + if (updated & cmask || !new_crtc_state->active)
> continue;
> if (skl_ddb_allocation_overlaps(state, cur_ddb, new_ddb,
> pipe))
> @@ -14258,12 +14261,12 @@ static void skl_update_crtcs(struct
> drm_atomic_state *state,
> * new ddb allocation to take effect.
> */
> if (!skl_ddb_allocation_equals(cur_ddb, new_ddb, pipe)
> &&
> - !crtc->state->active_changed &&
> + !new_crtc_state->active_changed &&
> intel_state->wm_results.dirty_pipes != updated)
> vbl_wait = true;
>
> intel_update_crtc(crtc, state, old_crtc_state,
> - crtc_vblank_mask);
> + new_crtc_state, crtc_vblank_mask);
>
> if (vbl_wait)
> intel_wait_for_vblank(dev, pipe);
> @@ -14278,7 +14281,7 @@ static void intel_atomic_commit_tail(struct
> drm_atomic_state *state)
> struct drm_device *dev = state->dev;
> struct intel_atomic_state *intel_state = to_intel_atomic_state(state);
> struct drm_i915_private *dev_priv = to_i915(dev);
> - struct drm_crtc_state *old_crtc_state;
> + struct drm_crtc_state *old_crtc_state, *new_crtc_state;
> struct drm_crtc *crtc;
> struct intel_crtc_state *intel_cstate;
> struct drm_plane *plane;
> @@ -14288,7 +14291,7 @@ static void intel_atomic_commit_tail(struct
> drm_atomic_state *state)
> unsigned crtc_vblank_mask = 0;
> int i, ret;
>
> - for_each_plane_in_state(state, plane, plane_state, i) {
> + for_each_new_plane_in_state(state, plane, plane_state, i) {
> struct intel_plane_state *intel_plane_state =
> to_intel_plane_state(plane_state);
>
> @@ -14313,22 +14316,23 @@ static void intel_atomic_commit_tail(struct
> drm_atomic_state *state)
> intel_display_power_get(dev_priv, POWER_DOMAIN_MODESET);
> }
>
> - for_each_crtc_in_state(state, crtc, old_crtc_state, i) {
> + for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state,
> new_crtc_state, i) {
> struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
>
> - if (needs_modeset(crtc->state) ||
> - to_intel_crtc_state(crtc->state)->update_pipe) {
> + if (needs_modeset(new_crtc_state) ||
> + to_intel_crtc_state(new_crtc_state)->update_pipe) {
> hw_check = true;
>
> put_domains[to_intel_crtc(crtc)->pipe] =
> modeset_get_crtc_power_domains(crtc,
> - to_intel_crtc_state(crtc->state));
> + to_intel_crtc_state(new_crtc_state));
> }
>
> - if (!needs_modeset(crtc->state))
> + if (!needs_modeset(new_crtc_state))
> continue;
>
> - intel_pre_plane_update(to_intel_crtc_state(old_crtc_state));
> + intel_pre_plane_update(to_intel_crtc_state(old_crtc_state),
> + to_intel_crtc_state(new_crtc_state));
>
> if (old_crtc_state->active) {
> intel_crtc_disable_planes(crtc,
> old_crtc_state->plane_mask);
> @@ -14372,16 +14376,16 @@ static void intel_atomic_commit_tail(struct
> drm_atomic_state *state)
> }
>
> /* Complete the events for pipes that have now been disabled */
> - for_each_crtc_in_state(state, crtc, old_crtc_state, i) {
> - bool modeset = needs_modeset(crtc->state);
> + for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) {
> + bool modeset = needs_modeset(new_crtc_state);
>
> /* Complete events for now disable pipes here. */
> - if (modeset && !crtc->state->active && crtc->state->event) {
> + if (modeset && !new_crtc_state->active &&
> new_crtc_state->event) {
> spin_lock_irq(&dev->event_lock);
> - drm_crtc_send_vblank_event(crtc, crtc->state->event);
> + drm_crtc_send_vblank_event(crtc, new_crtc_state->event);
> spin_unlock_irq(&dev->event_lock);
>
> - crtc->state->event = NULL;
> + new_crtc_state->event = NULL;
> }
> }
>
> @@ -14407,20 +14411,20 @@ static void intel_atomic_commit_tail(struct
> drm_atomic_state *state)
> *
> * TODO: Move this (and other cleanup) to an async worker eventually.
> */
> - for_each_crtc_in_state(state, crtc, old_crtc_state, i) {
> - intel_cstate = to_intel_crtc_state(crtc->state);
> + for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) {
> + intel_cstate = to_intel_crtc_state(new_crtc_state);
>
> if (dev_priv->display.optimize_watermarks)
> dev_priv->display.optimize_watermarks(intel_cstate);
> }
>
> - for_each_crtc_in_state(state, crtc, old_crtc_state, i) {
> + for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state,
> new_crtc_state, i) {
> intel_post_plane_update(to_intel_crtc_state(old_crtc_state));
>
> if (put_domains[i])
> modeset_put_power_domains(dev_priv, put_domains[i]);
>
> - intel_modeset_verify_crtc(crtc, old_crtc_state, crtc->state);
> + intel_modeset_verify_crtc(crtc, old_crtc_state, new_crtc_state);
> }
>
> if (IS_SKYLAKE(dev_priv) && intel_state->modeset &&
> @@ -14464,13 +14468,13 @@ static void intel_atomic_commit_work(struct
> work_struct *work)
>
> static void intel_atomic_track_fbs(struct drm_atomic_state *state)
> {
> - struct drm_plane_state *old_plane_state;
> + struct drm_plane_state *old_plane_state, *new_plane_state;
> struct drm_plane *plane;
> int i;
>
> - for_each_plane_in_state(state, plane, old_plane_state, i)
> + for_each_oldnew_plane_in_state(state, plane, old_plane_state,
> new_plane_state, i)
> i915_gem_track_fb(intel_fb_obj(old_plane_state->fb),
> - intel_fb_obj(plane->state->fb),
> + intel_fb_obj(new_plane_state->fb),
> to_intel_plane(plane)->frontbuffer_bit);
> }
>
> @@ -16299,7 +16303,7 @@ retry:
> }
>
> /* Write calculated watermark values back */
> - for_each_crtc_in_state(state, crtc, cstate, i) {
> + for_each_new_crtc_in_state(state, crtc, cstate, i) {
> struct intel_crtc_state *cs = to_intel_crtc_state(cstate);
>
> cs->wm.need_postvbl_update = true;
Apart from that lingering primary->state stuff this seems good. I can't
say how many other foo->state dereferences still remain as I didn't
crawl through the entire codebase.
With that caveat in mind this is
Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> --
> 2.7.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel OTC
