return 0;
}
-static bool intel_fbc_can_activate(struct intel_crtc *crtc)
+static bool intel_fbc_can_activate(struct intel_fbc *fbc)
{
- struct drm_i915_private *i915 = to_i915(crtc->base.dev);
- struct intel_fbc *fbc = &i915->fbc;
+ struct drm_i915_private *i915 = fbc->i915;
struct intel_fbc_state *cache = &fbc->state_cache;
if (!intel_fbc_can_enable(fbc))
if (drm_atomic_crtc_needs_modeset(&new_crtc_state->uapi))
return false;
- if (!intel_fbc_can_activate(crtc))
+ if (!intel_fbc_can_activate(fbc))
return false;
if (!old_fb || !new_fb)
fbc->crtc = NULL;
}
-static void __intel_fbc_post_update(struct intel_crtc *crtc)
+static void __intel_fbc_post_update(struct intel_fbc *fbc)
{
- struct drm_i915_private *i915 = to_i915(crtc->base.dev);
- struct intel_fbc *fbc = &i915->fbc;
+ struct drm_i915_private *i915 = fbc->i915;
drm_WARN_ON(&i915->drm, !mutex_is_locked(&fbc->lock));
- if (fbc->crtc != crtc)
- return;
-
- fbc->flip_pending = false;
-
if (!i915->params.enable_fbc) {
intel_fbc_deactivate(fbc, "disabled at runtime per module param");
__intel_fbc_disable(fbc);
return;
}
- intel_fbc_get_reg_params(fbc, crtc);
-
- if (!intel_fbc_can_activate(crtc))
+ if (!intel_fbc_can_activate(fbc))
return;
if (!fbc->busy_bits)
return;
mutex_lock(&fbc->lock);
- __intel_fbc_post_update(crtc);
+ if (fbc->crtc == crtc) {
+ fbc->flip_pending = false;
+ intel_fbc_get_reg_params(fbc, crtc);
+ __intel_fbc_post_update(fbc);
+ }
mutex_unlock(&fbc->lock);
}
if (fbc->active)
intel_fbc_nuke(fbc);
else if (!fbc->flip_pending)
- __intel_fbc_post_update(fbc->crtc);
+ __intel_fbc_post_update(fbc);
}
out: