Atomic helpers call drm_atomic_helper_check_plane_damage() after the atomic_check anyway. See atomic_helper_check_planes(). Remove the calls from the planes' atomic_check.
Signed-off-by: Thomas Zimmermann <[email protected]> --- drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 3 --- drivers/gpu/drm/ingenic/ingenic-ipu.c | 8 ++------ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c index 42c86f195c66..e99b44e3ac92 100644 --- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c +++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c @@ -519,9 +519,6 @@ static int ingenic_drm_plane_atomic_check(struct drm_plane *plane, old_plane_state->fb->format->format != new_plane_state->fb->format->format)) crtc_state->mode_changed = true; - if (priv->soc_info->map_noncoherent) - drm_atomic_helper_check_plane_damage(state, new_plane_state); - return 0; } diff --git a/drivers/gpu/drm/ingenic/ingenic-ipu.c b/drivers/gpu/drm/ingenic/ingenic-ipu.c index 56143a191f36..fd17c642c7ac 100644 --- a/drivers/gpu/drm/ingenic/ingenic-ipu.c +++ b/drivers/gpu/drm/ingenic/ingenic-ipu.c @@ -594,7 +594,7 @@ static int ingenic_ipu_plane_atomic_check(struct drm_plane *plane, if (!new_plane_state->crtc || !crtc_state->mode.hdisplay || !crtc_state->mode.vdisplay) - goto out_check_damage; + return 0; /* Plane must be fully visible */ if (new_plane_state->crtc_x < 0 || new_plane_state->crtc_y < 0 || @@ -611,7 +611,7 @@ static int ingenic_ipu_plane_atomic_check(struct drm_plane *plane, return -EINVAL; if (!osd_changed(new_plane_state, old_plane_state)) - goto out_check_damage; + return 0; crtc_state->mode_changed = true; @@ -645,10 +645,6 @@ static int ingenic_ipu_plane_atomic_check(struct drm_plane *plane, ipu_state->denom_w = denom_w; ipu_state->denom_h = denom_h; -out_check_damage: - if (ingenic_drm_map_noncoherent(ipu->master)) - drm_atomic_helper_check_plane_damage(state, new_plane_state); - return 0; } -- 2.54.0
