On Fri, Sep 20, 2019 at 01:42:18PM +0200, Maarten Lankhorst wrote:
> We had this as an optimization to not do a plane update, but we killed
> it off because there are so many reasons we may have to do a plane
> update or fastset that it's best to just assume everything changed.
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx>
Reviewed-by: Matt Roper <matthew.d.roper@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_atomic.c | 1 -
> drivers/gpu/drm/i915/display/intel_display.c | 10 +---------
> drivers/gpu/drm/i915/display/intel_display_types.h | 1 -
> 3 files changed, 1 insertion(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c b/drivers/gpu/drm/i915/display/intel_atomic.c
> index fb550d3cea7f..4b4eee9c49f5 100644
> --- a/drivers/gpu/drm/i915/display/intel_atomic.c
> +++ b/drivers/gpu/drm/i915/display/intel_atomic.c
> @@ -208,7 +208,6 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc)
> crtc_state->disable_cxsr = false;
> crtc_state->update_wm_pre = false;
> crtc_state->update_wm_post = false;
> - crtc_state->fb_changed = false;
> crtc_state->fifo_changed = false;
> crtc_state->wm.need_postvbl_update = false;
> crtc_state->fb_bits = 0;
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index e40485a1e503..520c66071e67 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -11521,7 +11521,6 @@ int intel_plane_atomic_calc_changes(const struct intel_crtc_state *old_crtc_stat
> bool was_crtc_enabled = old_crtc_state->hw.active;
> bool is_crtc_enabled = crtc_state->hw.active;
> bool turn_off, turn_on, visible, was_visible;
> - struct drm_framebuffer *fb = plane_state->base.fb;
> int ret;
>
> if (INTEL_GEN(dev_priv) >= 9 && plane->id != PLANE_CURSOR) {
> @@ -11555,18 +11554,11 @@ int intel_plane_atomic_calc_changes(const struct intel_crtc_state *old_crtc_stat
> if (!was_visible && !visible)
> return 0;
>
> - if (fb != old_plane_state->base.fb)
> - crtc_state->fb_changed = true;
> -
> turn_off = was_visible && (!visible || mode_changed);
> turn_on = visible && (!was_visible || mode_changed);
>
> - DRM_DEBUG_ATOMIC("[CRTC:%d:%s] has [PLANE:%d:%s] with fb %i\n",
> + DRM_DEBUG_ATOMIC("[CRTC:%d:%s] with [PLANE:%d:%s] visible %i -> %i, off %i, on %i, ms %i\n",
> crtc->base.base.id, crtc->base.name,
> - plane->base.base.id, plane->base.name,
> - fb ? fb->base.id : -1);
> -
> - DRM_DEBUG_ATOMIC("[PLANE:%d:%s] visible %i -> %i, off %i, on %i, ms %i\n",
> plane->base.base.id, plane->base.name,
> was_visible, visible,
> turn_off, turn_on, mode_changed);
> diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
> index e81b785cc8f2..57dbcfc126df 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_types.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
> @@ -792,7 +792,6 @@ struct intel_crtc_state {
> bool update_pipe; /* can a fast modeset be performed? */
> bool disable_cxsr;
> bool update_wm_pre, update_wm_post; /* watermarks are updated */
> - bool fb_changed; /* fb on any of the planes is changed */
> bool fifo_changed; /* FIFO split is changed */
>
> /* Pipe source size (ie. panel fitter input size)
> --
> 2.20.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
