Commit c22d62e6 authored by Maarten Lankhorst's avatar Maarten Lankhorst

drm/i915: Get rid of crtc_state->fb_changed

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: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190920114235.22411-6-maarten.lankhorst@linux.intel.comReviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
parent 8aa940c8
...@@ -199,7 +199,6 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc) ...@@ -199,7 +199,6 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc)
crtc_state->disable_cxsr = false; crtc_state->disable_cxsr = false;
crtc_state->update_wm_pre = false; crtc_state->update_wm_pre = false;
crtc_state->update_wm_post = false; crtc_state->update_wm_post = false;
crtc_state->fb_changed = false;
crtc_state->fifo_changed = false; crtc_state->fifo_changed = false;
crtc_state->wm.need_postvbl_update = false; crtc_state->wm.need_postvbl_update = false;
crtc_state->fb_bits = 0; crtc_state->fb_bits = 0;
......
...@@ -11582,7 +11582,6 @@ int intel_plane_atomic_calc_changes(const struct intel_crtc_state *old_crtc_stat ...@@ -11582,7 +11582,6 @@ int intel_plane_atomic_calc_changes(const struct intel_crtc_state *old_crtc_stat
bool was_crtc_enabled = old_crtc_state->base.active; bool was_crtc_enabled = old_crtc_state->base.active;
bool is_crtc_enabled = crtc_state->base.active; bool is_crtc_enabled = crtc_state->base.active;
bool turn_off, turn_on, visible, was_visible; bool turn_off, turn_on, visible, was_visible;
struct drm_framebuffer *fb = plane_state->base.fb;
int ret; int ret;
if (INTEL_GEN(dev_priv) >= 9 && plane->id != PLANE_CURSOR) { if (INTEL_GEN(dev_priv) >= 9 && plane->id != PLANE_CURSOR) {
...@@ -11616,18 +11615,11 @@ int intel_plane_atomic_calc_changes(const struct intel_crtc_state *old_crtc_stat ...@@ -11616,18 +11615,11 @@ int intel_plane_atomic_calc_changes(const struct intel_crtc_state *old_crtc_stat
if (!was_visible && !visible) if (!was_visible && !visible)
return 0; return 0;
if (fb != old_plane_state->base.fb)
crtc_state->fb_changed = true;
turn_off = was_visible && (!visible || mode_changed); turn_off = was_visible && (!visible || mode_changed);
turn_on = visible && (!was_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, 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, plane->base.base.id, plane->base.name,
was_visible, visible, was_visible, visible,
turn_off, turn_on, mode_changed); turn_off, turn_on, mode_changed);
......
...@@ -766,7 +766,6 @@ struct intel_crtc_state { ...@@ -766,7 +766,6 @@ struct intel_crtc_state {
bool update_pipe; /* can a fast modeset be performed? */ bool update_pipe; /* can a fast modeset be performed? */
bool disable_cxsr; bool disable_cxsr;
bool update_wm_pre, update_wm_post; /* watermarks are updated */ 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 */ bool fifo_changed; /* FIFO split is changed */
/* Pipe source size (ie. panel fitter input size) /* Pipe source size (ie. panel fitter input size)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment