On Tue, 2015-11-03 at 08:31 +0100, Maarten Lankhorst wrote:
> fb_bits is useful to have in the crtc_state for cs flips later on,
Why? When is later on?
> so keep it alive there. The other stuff can be calculated in
> post_plane_update, and aren't useful elsewhere.
>
> Currently there's a loop in post_plane_update, this should disappear
> with the changes to atomic wm's. At that point only updates to the
> primary plane are important.
Looks like the loop is gone in v2, but the commit message wasn't updated.
Ander
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/intel_atomic.c | 1 +
> drivers/gpu/drm/i915/intel_display.c | 29 ++++++++++++++++++++---------
> drivers/gpu/drm/i915/intel_drv.h | 3 +--
> 3 files changed, 22 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_atomic.c
> b/drivers/gpu/drm/i915/intel_atomic.c
> index 2ba0cd698f9b..d890f5f63240 100644
> --- a/drivers/gpu/drm/i915/intel_atomic.c
> +++ b/drivers/gpu/drm/i915/intel_atomic.c
> @@ -98,6 +98,7 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc)
> crtc_state->visible_changed = false;
> crtc_state->wm_changed = false;
> crtc_state->fb_changed = false;
> + crtc_state->fb_bits = 0;
>
> return &crtc_state->base;
> }
> diff --git a/drivers/gpu/drm/i915/intel_display.c
> b/drivers/gpu/drm/i915/intel_display.c
> index 77fe1d75404b..c42e87c62133 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -4742,15 +4742,20 @@ intel_pre_disable_primary(struct drm_crtc *crtc)
> hsw_disable_ips(intel_crtc);
> }
>
> -static void intel_post_plane_update(struct intel_crtc *crtc)
> +static void intel_post_plane_update(struct intel_crtc_state *old_crtc_state)
> {
> + struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->base.crtc);
> + struct drm_atomic_state *old_state = old_crtc_state->base.state;
> struct intel_crtc_atomic_commit *atomic = &crtc->atomic;
> struct intel_crtc_state *pipe_config =
> to_intel_crtc_state(crtc->base.state);
> struct drm_device *dev = crtc->base.dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_plane *primary = crtc->base.primary;
> + struct drm_plane_state *old_pri_state =
> + drm_atomic_get_existing_plane_state(old_state, primary);
>
> - intel_frontbuffer_flip(dev, atomic->fb_bits);
> + intel_frontbuffer_flip(dev, pipe_config->fb_bits);
>
> crtc->wm.cxsr_allowed = true;
>
> @@ -4760,8 +4765,17 @@ static void intel_post_plane_update(struct intel_crtc
> *crtc)
> if (atomic->update_fbc)
> intel_fbc_update(dev_priv);
>
> - if (atomic->post_enable_primary)
> - intel_post_enable_primary(&crtc->base);
> + if (old_pri_state) {
> + struct intel_plane_state *primary_state =
> + to_intel_plane_state(primary->state);
> + struct intel_plane_state *old_primary_state =
> + to_intel_plane_state(old_pri_state);
> +
> + if (primary_state->visible &&
> + (needs_modeset(&pipe_config->base) ||
> + !old_primary_state->visible))
> + intel_post_enable_primary(&crtc->base);
> + }
>
> memset(atomic, 0, sizeof(*atomic));
> }
> @@ -11685,13 +11699,10 @@ int intel_plane_atomic_calc_changes(struct
> drm_crtc_state *crtc_state,
> }
>
> if (visible || was_visible)
> - intel_crtc->atomic.fb_bits |=
> - to_intel_plane(plane)->frontbuffer_bit;
> + pipe_config->fb_bits |= to_intel_plane(plane)
> ->frontbuffer_bit;
>
> switch (plane->type) {
> case DRM_PLANE_TYPE_PRIMARY:
> - intel_crtc->atomic.post_enable_primary = turn_on;
> -
> if (turn_off)
> intel_crtc->atomic.disable_fbc = true;
>
> @@ -13389,7 +13400,7 @@ static int intel_atomic_commit(struct drm_device *dev,
> intel_atomic_wait_for_vblanks(dev, dev_priv, crtc_vblank_mask);
>
> for_each_crtc_in_state(state, crtc, crtc_state, i)
> - intel_post_plane_update(to_intel_crtc(crtc));
> + intel_post_plane_update(to_intel_crtc_state(crtc_state));
>
> mutex_lock(&dev->struct_mutex);
> drm_atomic_helper_cleanup_planes(dev, state);
> diff --git a/drivers/gpu/drm/i915/intel_drv.h
> b/drivers/gpu/drm/i915/intel_drv.h
> index dc024c27ca1e..aceeeccec09b 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -372,6 +372,7 @@ struct intel_crtc_state {
> #define PIPE_CONFIG_QUIRK_MODE_SYNC_FLAGS (1<<0) /* unreliable sync
> mode.flags */
> unsigned long quirks;
>
> + unsigned fb_bits; /* framebuffers to flip */
> bool update_pipe; /* can a fast modeset be performed? */
> bool visible_changed; /* plane visibility changed */
> bool wm_changed; /* wm changed */
> @@ -539,9 +540,7 @@ struct intel_crtc_atomic_commit {
> bool disable_fbc;
>
> /* Sleepable operations to perform after commit */
> - unsigned fb_bits;
> bool update_fbc;
> - bool post_enable_primary;
> };
>
> struct intel_crtc {
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
