diff options
| author | Daniel Stone <daniels@collabora.com> | 2025-12-15 15:09:18 +0100 |
|---|---|---|
| committer | Heiko Stuebner <heiko@sntech.de> | 2026-01-08 20:00:34 +0100 |
| commit | 2f4e3f2bef45d1eb4d8204c5f204cf274e8a6ca6 (patch) | |
| tree | f311fe034afdf0b9fbdda86d39f282a09aa35ce9 | |
| parent | 78de5d28d7207f816565fa43ec44e6735c319ddf (diff) | |
drm/rockchip: vop2: Switch impossible pos conditional to WARN_ON
We already clip the plane to the display bounds in atomic_check, and
ensure that it is sufficiently sized. Instead of trying to catch this
and adjust for it in atomic_update, just assert that atomic_check has
done its job.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Nicolas Frattaroli <nicolas.frattaroli@collabora.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patch.msgid.link/20251215-vop2-atomic-fixups-v5-2-83463c075a8d@collabora.com
| -rw-r--r-- | drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index 20b49209ddcd..1cad5a8ece61 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -1214,28 +1214,16 @@ static void vop2_plane_atomic_update(struct drm_plane *plane, src_w = drm_rect_width(src) >> 16; src_h = drm_rect_height(src) >> 16; dsp_w = drm_rect_width(dest); - - if (dest->x1 + dsp_w > adjusted_mode->hdisplay) { - drm_dbg_kms(vop2->drm, - "vp%d %s dest->x1[%d] + dsp_w[%d] exceed mode hdisplay[%d]\n", - vp->id, win->data->name, dest->x1, dsp_w, adjusted_mode->hdisplay); - dsp_w = adjusted_mode->hdisplay - dest->x1; - if (dsp_w < 4) - dsp_w = 4; - src_w = dsp_w * src_w / drm_rect_width(dest); - } - dsp_h = drm_rect_height(dest); - if (dest->y1 + dsp_h > adjusted_mode->vdisplay) { - drm_dbg_kms(vop2->drm, - "vp%d %s dest->y1[%d] + dsp_h[%d] exceed mode vdisplay[%d]\n", - vp->id, win->data->name, dest->y1, dsp_h, adjusted_mode->vdisplay); - dsp_h = adjusted_mode->vdisplay - dest->y1; - if (dsp_h < 4) - dsp_h = 4; - src_h = dsp_h * src_h / drm_rect_height(dest); - } + /* drm_atomic_helper_check_plane_state calls drm_rect_clip_scaled for + * us, which keeps our planes bounded within the CRTC active area + */ + if (WARN_ON(dest->x1 + dsp_w > adjusted_mode->hdisplay) || + WARN_ON(dest->y1 + dsp_h > adjusted_mode->vdisplay) || + WARN_ON(dsp_w < 4) || WARN_ON(dsp_h < 4) || + WARN_ON(src_w < 4) || WARN_ON(src_h < 4)) + return; /* * This is workaround solution for IC design: |