[PATCH 5/8] media: mtk-mdp: Do not refuse a crop for the other side's size

From: Ryan Brue

Date: Fri Nov 20 2026 - 14:56:08 EST


Setting the source crop checks the scaling ratio against the destination
as it stands: the 32x32 default that open() sets, or whatever a client
set while probing. GStreamer sets the source format and crop first, and
a 1280x720 crop was refused with -EINVAL against that 32x32 destination.
The same holds for the compose rectangle and the source, and for the
rotation control.

Check the ratio once both queues are streaming, when both sizes are
settled: at VIDIOC_STREAMON, and for a crop, compose or rotation change
made while streaming. VIDIOC_STREAMON is the first point where both
sizes are known: before it a client may still set either side in any
order, and checking there leaves the queues untouched on refusal. Log a
refusal at debug level, since any client can trigger it.

Fixes: 0d1e342a17f5 ("media: mtk-mdp: Remove states for format checks")
Signed-off-by: Ryan Brue <ryanbrue.dev@xxxxxxxxx>
---
drivers/media/platform/mediatek/mdp/mtk_mdp_m2m.c | 121 +++++++++++++---------
1 file changed, 73 insertions(+), 48 deletions(-)

diff --git a/drivers/media/platform/mediatek/mdp/mtk_mdp_m2m.c b/drivers/media/platform/mediatek/mdp/mtk_mdp_m2m.c
index 34d02de4453d..a40bcf61b7ca 100644
--- a/drivers/media/platform/mediatek/mdp/mtk_mdp_m2m.c
+++ b/drivers/media/platform/mediatek/mdp/mtk_mdp_m2m.c
@@ -727,10 +727,40 @@ static int mtk_mdp_m2m_reqbufs(struct file *file, void *fh,
return v4l2_m2m_reqbufs(file, ctx->m2m_ctx, reqbufs);
}

+static int mtk_mdp_check_scaler_ratio(struct mtk_mdp_variant *var, int src_w,
+ int src_h, int dst_w, int dst_h, int rot)
+{
+ int tmp_w, tmp_h;
+
+ if (rot == 90 || rot == 270) {
+ tmp_w = dst_h;
+ tmp_h = dst_w;
+ } else {
+ tmp_w = dst_w;
+ tmp_h = dst_h;
+ }
+
+ if ((src_w / tmp_w) > var->h_scale_down_max ||
+ (src_h / tmp_h) > var->v_scale_down_max ||
+ (tmp_w / src_w) > var->h_scale_up_max ||
+ (tmp_h / src_h) > var->v_scale_up_max)
+ return -EINVAL;
+
+ return 0;
+}
+
+/* Both sizes are settled once both queues are streaming */
+static bool mtk_mdp_ctx_streaming(struct mtk_mdp_ctx *ctx)
+{
+ return vb2_is_streaming(v4l2_m2m_get_src_vq(ctx->m2m_ctx)) &&
+ vb2_is_streaming(v4l2_m2m_get_dst_vq(ctx->m2m_ctx));
+}
+
static int mtk_mdp_m2m_streamon(struct file *file, void *fh,
enum v4l2_buf_type type)
{
struct mtk_mdp_ctx *ctx = file_to_ctx(file);
+ struct vb2_queue *other;
int ret;

if (!mtk_mdp_ctx_state_is_set(ctx, MTK_MDP_VPU_INIT)) {
@@ -744,6 +774,21 @@ static int mtk_mdp_m2m_streamon(struct file *file, void *fh,
mtk_mdp_ctx_state_lock_set(ctx, MTK_MDP_VPU_INIT);
}

+ /* the queue that starts second checks the ratio */
+ other = v4l2_m2m_get_vq(ctx->m2m_ctx, V4L2_TYPE_IS_OUTPUT(type) ?
+ V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE :
+ V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE);
+ if (vb2_is_streaming(other) &&
+ mtk_mdp_check_scaler_ratio(ctx->mdp_dev->variant,
+ ctx->s_frame.crop.width,
+ ctx->s_frame.crop.height,
+ ctx->d_frame.crop.width,
+ ctx->d_frame.crop.height,
+ ctx->ctrls.rotate->val)) {
+ dev_dbg(&ctx->mdp_dev->pdev->dev, "Out of scaler range\n");
+ return -EINVAL;
+ }
+
return v4l2_m2m_streamon(file, ctx->m2m_ctx, type);
}

@@ -810,35 +855,12 @@ static int mtk_mdp_m2m_g_selection(struct file *file, void *fh,
return -EINVAL;
}

-static int mtk_mdp_check_scaler_ratio(struct mtk_mdp_variant *var, int src_w,
- int src_h, int dst_w, int dst_h, int rot)
-{
- int tmp_w, tmp_h;
-
- if (rot == 90 || rot == 270) {
- tmp_w = dst_h;
- tmp_h = dst_w;
- } else {
- tmp_w = dst_w;
- tmp_h = dst_h;
- }
-
- if ((src_w / tmp_w) > var->h_scale_down_max ||
- (src_h / tmp_h) > var->v_scale_down_max ||
- (tmp_w / src_w) > var->h_scale_up_max ||
- (tmp_h / src_h) > var->v_scale_up_max)
- return -EINVAL;
-
- return 0;
-}
-
static int mtk_mdp_m2m_s_selection(struct file *file, void *fh,
struct v4l2_selection *s)
{
struct mtk_mdp_ctx *ctx = file_to_ctx(file);
struct mtk_mdp_frame *frame;
struct v4l2_rect new_r;
- struct mtk_mdp_variant *variant = ctx->mdp_dev->variant;
int ret;
bool valid = false;

@@ -865,22 +887,27 @@ static int mtk_mdp_m2m_s_selection(struct file *file, void *fh,
else
frame = &ctx->d_frame;

- /* Check to see if scaling ratio is within supported range */
- if (V4L2_TYPE_IS_OUTPUT(s->type))
- ret = mtk_mdp_check_scaler_ratio(variant, new_r.width,
- new_r.height, ctx->d_frame.crop.width,
- ctx->d_frame.crop.height,
- ctx->ctrls.rotate->val);
- else
- ret = mtk_mdp_check_scaler_ratio(variant,
- ctx->s_frame.crop.width,
- ctx->s_frame.crop.height, new_r.width,
- new_r.height, ctx->ctrls.rotate->val);
-
- if (ret) {
- dev_info(&ctx->mdp_dev->pdev->dev,
- "Out of scaler range");
- return -EINVAL;
+ /*
+ * Until both queues are streaming the other side's size may still
+ * change, and VIDIOC_STREAMON checks the scaling ratio.
+ */
+ if (mtk_mdp_ctx_streaming(ctx)) {
+ struct v4l2_rect *src = &ctx->s_frame.crop;
+ struct v4l2_rect *dst = &ctx->d_frame.crop;
+
+ if (V4L2_TYPE_IS_OUTPUT(s->type))
+ src = &new_r;
+ else
+ dst = &new_r;
+
+ if (mtk_mdp_check_scaler_ratio(ctx->mdp_dev->variant,
+ src->width, src->height,
+ dst->width, dst->height,
+ ctx->ctrls.rotate->val)) {
+ dev_dbg(&ctx->mdp_dev->pdev->dev,
+ "Out of scaler range\n");
+ return -EINVAL;
+ }
}

s->r = new_r;
@@ -953,7 +980,6 @@ static int mtk_mdp_s_ctrl(struct v4l2_ctrl *ctrl)
struct mtk_mdp_ctx *ctx = ctrl_to_ctx(ctrl);
struct mtk_mdp_dev *mdp = ctx->mdp_dev;
struct mtk_mdp_variant *variant = mdp->variant;
- int ret = 0;

if (ctrl->flags & V4L2_CTRL_FLAG_INACTIVE)
return 0;
@@ -966,14 +992,13 @@ static int mtk_mdp_s_ctrl(struct v4l2_ctrl *ctrl)
ctx->vflip = ctrl->val;
break;
case V4L2_CID_ROTATE:
- ret = mtk_mdp_check_scaler_ratio(variant,
- ctx->s_frame.crop.width,
- ctx->s_frame.crop.height,
- ctx->d_frame.crop.width,
- ctx->d_frame.crop.height,
- ctx->ctrls.rotate->val);
-
- if (ret)
+ if (mtk_mdp_ctx_streaming(ctx) &&
+ mtk_mdp_check_scaler_ratio(variant,
+ ctx->s_frame.crop.width,
+ ctx->s_frame.crop.height,
+ ctx->d_frame.crop.width,
+ ctx->d_frame.crop.height,
+ ctx->ctrls.rotate->val))
return -EINVAL;

ctx->rotation = ctrl->val;

--
2.56.0