From: Ville Syrjälä <[email protected]> There's no real reaosn to check crtc_state->active and plane_state->ggtt_vma in intel_reuse_initial_plane_fb(). All we really care about is the presence of the fb, so check for that instead.
Signed-off-by: Ville Syrjälä <[email protected]> --- drivers/gpu/drm/i915/display/intel_initial_plane.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_initial_plane.c b/drivers/gpu/drm/i915/display/intel_initial_plane.c index a19c5487ccf3..67e4bbbd0d6a 100644 --- a/drivers/gpu/drm/i915/display/intel_initial_plane.c +++ b/drivers/gpu/drm/i915/display/intel_initial_plane.c @@ -55,13 +55,8 @@ intel_reuse_initial_plane_fb(struct intel_crtc *this, to_intel_plane(crtc->base.primary); const struct intel_plane_state *plane_state = to_intel_plane_state(plane->base.state); - const struct intel_crtc_state *crtc_state = - to_intel_crtc_state(crtc->base.state); - if (!crtc_state->hw.active) - continue; - - if (!plane_state->ggtt_vma) + if (!plane_state->hw.fb) continue; if (all_plane_configs->config[this->pipe].base == -- 2.54.0
