From nobody Tue Feb 10 00:27:31 2026 Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C34ED33CEB6 for ; Wed, 3 Dec 2025 15:54:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.203.201.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764777260; cv=none; b=Gk1OfHnCJ8hPjudjpPcTJkvUO0t50wUpJE8Q0CW6O1EIPz3rbhJJZcPzmHXVhbK5gRF9lNB87yFFzVny6prv/1deNMF6iZZGTXKFO0Z8KQ86wNn//F9VEa305yMTruOAODvZbHGbdJqfCBWEFTYYgMXY0n2z5EJ063lvx6Mi1WE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764777260; c=relaxed/simple; bh=JqXs1xY0bABWRToTWbi2Ze6HDkaXyYHOGyGdtuEuuYA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FSQxMgL4LINjpXYjappdowHTxBecfP8EsMrG6pvRQCryVrHdHUay+tl1jkylTIfMK/t2uLdWg37BU0ZvvAz4PJRgxsrrOo35xcgXnDY0Odkog0Ax/0e9DgJVfv1WMciHTr9nOLXUrwxDBzCeTMGwKfQxRloxbdtLyzRBSEprX80= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=pass smtp.mailfrom=pengutronix.de; arc=none smtp.client-ip=185.203.201.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pengutronix.de Received: from ptz.office.stw.pengutronix.de ([2a0a:edc0:0:900:1d::77] helo=peter.mobile.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1vQpAd-0007dW-2J; Wed, 03 Dec 2025 16:53:35 +0100 From: =?utf-8?q?Sven_P=C3=BCschel?= Date: Wed, 03 Dec 2025 16:52:28 +0100 Subject: [PATCH v2 06/22] media: rockchip: rga: remove redundant rga_frame variables Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251203-spu-rga3-v2-6-989a67947f71@pengutronix.de> References: <20251203-spu-rga3-v2-0-989a67947f71@pengutronix.de> In-Reply-To: <20251203-spu-rga3-v2-0-989a67947f71@pengutronix.de> To: Jacob Chen , Ezequiel Garcia , Mauro Carvalho Chehab , Heiko Stuebner , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, kernel@pengutronix.de, =?utf-8?q?Sven_P=C3=BCschel?= X-Mailer: b4 0.14.3 X-SA-Exim-Connect-IP: 2a0a:edc0:0:900:1d::77 X-SA-Exim-Mail-From: s.pueschel@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Remove the redundant rga_frame variables width, height and color space. The value of these variables is already contained in the pix member of rga_frame. The code also keeps these values in sync. Therefore drop them in favor of the existing pix member. Signed-off-by: Sven P=C3=BCschel Reviewed-by: Nicolas Dufresne --- drivers/media/platform/rockchip/rga/rga-buf.c | 6 ++--- drivers/media/platform/rockchip/rga/rga-hw.c | 6 ++--- drivers/media/platform/rockchip/rga/rga.c | 32 ++++++++++-------------= ---- drivers/media/platform/rockchip/rga/rga.h | 5 ----- 4 files changed, 18 insertions(+), 31 deletions(-) diff --git a/drivers/media/platform/rockchip/rga/rga-buf.c b/drivers/media/= platform/rockchip/rga/rga-buf.c index b5e6b1b527ca8..0c59a4d330888 100644 --- a/drivers/media/platform/rockchip/rga/rga-buf.c +++ b/drivers/media/platform/rockchip/rga/rga-buf.c @@ -100,10 +100,10 @@ static int get_plane_offset(struct rga_frame *f, if (plane =3D=3D 0) return 0; if (plane =3D=3D 1) - return stride * f->height; + return stride * f->pix.height; if (plane =3D=3D 2) - return stride * f->height + - (stride * f->height / info->hdiv / info->vdiv); + return stride * f->pix.height + + (stride * f->pix.height / info->hdiv / info->vdiv); =20 return -EINVAL; } diff --git a/drivers/media/platform/rockchip/rga/rga-hw.c b/drivers/media/p= latform/rockchip/rga/rga-hw.c index 43ed742a16492..f1d5237472941 100644 --- a/drivers/media/platform/rockchip/rga/rga-hw.c +++ b/drivers/media/platform/rockchip/rga/rga-hw.c @@ -53,7 +53,7 @@ rga_get_addr_offset(struct rga_frame *frm, struct rga_add= r_offset *offset, x_div =3D frm->fmt->x_div; y_div =3D frm->fmt->y_div; uv_stride =3D frm->stride / x_div; - pixel_width =3D frm->stride / frm->width; + pixel_width =3D frm->stride / frm->pix.width; =20 lt->y_off =3D offset->y_off + y * frm->stride + x * pixel_width; lt->u_off =3D offset->u_off + (y / y_div) * uv_stride + x / x_div; @@ -191,7 +191,7 @@ static void rga_cmd_set_trans_info(struct rga_ctx *ctx) =20 if (RGA_COLOR_FMT_IS_YUV(ctx->in.fmt->hw_format) && RGA_COLOR_FMT_IS_RGB(ctx->out.fmt->hw_format)) { - switch (ctx->in.colorspace) { + switch (ctx->in.pix.colorspace) { case V4L2_COLORSPACE_REC709: src_info.data.csc_mode =3D RGA_SRC_CSC_MODE_BT709_R0; break; @@ -203,7 +203,7 @@ static void rga_cmd_set_trans_info(struct rga_ctx *ctx) =20 if (RGA_COLOR_FMT_IS_RGB(ctx->in.fmt->hw_format) && RGA_COLOR_FMT_IS_YUV(ctx->out.fmt->hw_format)) { - switch (ctx->out.colorspace) { + switch (ctx->out.pix.colorspace) { case V4L2_COLORSPACE_REC709: dst_info.data.csc_mode =3D RGA_SRC_CSC_MODE_BT709_R0; break; diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/plat= form/rockchip/rga/rga.c index ef568b3758380..f50fbbab0645e 100644 --- a/drivers/media/platform/rockchip/rga/rga.c +++ b/drivers/media/platform/rockchip/rga/rga.c @@ -345,9 +345,6 @@ static struct rga_fmt *rga_fmt_find(u32 pixelformat) } =20 static struct rga_frame def_frame =3D { - .width =3D DEFAULT_WIDTH, - .height =3D DEFAULT_HEIGHT, - .colorspace =3D V4L2_COLORSPACE_DEFAULT, .crop.left =3D 0, .crop.top =3D 0, .crop.width =3D DEFAULT_WIDTH, @@ -379,9 +376,9 @@ static int rga_open(struct file *file) ctx->out =3D def_frame; =20 v4l2_fill_pixfmt_mp(&ctx->in.pix, - ctx->in.fmt->fourcc, ctx->out.width, ctx->out.height); + ctx->in.fmt->fourcc, DEFAULT_WIDTH, DEFAULT_HEIGHT); v4l2_fill_pixfmt_mp(&ctx->out.pix, - ctx->out.fmt->fourcc, ctx->out.width, ctx->out.height); + ctx->out.fmt->fourcc, DEFAULT_WIDTH, DEFAULT_HEIGHT); =20 if (mutex_lock_interruptible(&rga->mutex)) { kfree(ctx); @@ -469,10 +466,8 @@ static int vidioc_g_fmt(struct file *file, void *priv,= struct v4l2_format *f) if (IS_ERR(frm)) return PTR_ERR(frm); =20 - v4l2_fill_pixfmt_mp(pix_fmt, frm->fmt->fourcc, frm->width, frm->height); - + *pix_fmt =3D frm->pix; pix_fmt->field =3D V4L2_FIELD_NONE; - pix_fmt->colorspace =3D frm->colorspace; =20 return 0; } @@ -521,27 +516,24 @@ static int vidioc_s_fmt(struct file *file, void *priv= , struct v4l2_format *f) frm =3D rga_get_frame(ctx, f->type); if (IS_ERR(frm)) return PTR_ERR(frm); - frm->width =3D pix_fmt->width; - frm->height =3D pix_fmt->height; frm->size =3D 0; for (i =3D 0; i < pix_fmt->num_planes; i++) frm->size +=3D pix_fmt->plane_fmt[i].sizeimage; frm->fmt =3D rga_fmt_find(pix_fmt->pixelformat); frm->stride =3D pix_fmt->plane_fmt[0].bytesperline; - frm->colorspace =3D pix_fmt->colorspace; =20 /* Reset crop settings */ frm->crop.left =3D 0; frm->crop.top =3D 0; - frm->crop.width =3D frm->width; - frm->crop.height =3D frm->height; + frm->crop.width =3D pix_fmt->width; + frm->crop.height =3D pix_fmt->height; =20 frm->pix =3D *pix_fmt; =20 v4l2_dbg(debug, 1, &rga->v4l2_dev, "[%s] fmt - %p4cc %dx%d (stride %d, sizeimage %d)\n", V4L2_TYPE_IS_OUTPUT(f->type) ? "OUTPUT" : "CAPTURE", - &frm->fmt->fourcc, frm->width, frm->height, + &frm->fmt->fourcc, pix_fmt->width, pix_fmt->height, frm->stride, frm->size); =20 for (i =3D 0; i < pix_fmt->num_planes; i++) { @@ -595,8 +587,8 @@ static int vidioc_g_selection(struct file *file, void *= priv, } else { s->r.left =3D 0; s->r.top =3D 0; - s->r.width =3D f->width; - s->r.height =3D f->height; + s->r.width =3D f->pix.width; + s->r.height =3D f->pix.height; } =20 return 0; @@ -645,8 +637,8 @@ static int vidioc_s_selection(struct file *file, void *= priv, return -EINVAL; } =20 - if (s->r.left + s->r.width > f->width || - s->r.top + s->r.height > f->height || + if (s->r.left + s->r.width > f->pix.width || + s->r.top + s->r.height > f->pix.height || s->r.width < MIN_WIDTH || s->r.height < MIN_HEIGHT) { v4l2_dbg(debug, 1, &rga->v4l2_dev, "unsupported crop value.\n"); return -EINVAL; @@ -836,8 +828,8 @@ static int rga_probe(struct platform_device *pdev) goto rel_m2m; } =20 - def_frame.stride =3D (def_frame.width * def_frame.fmt->depth) >> 3; - def_frame.size =3D def_frame.stride * def_frame.height; + def_frame.stride =3D (DEFAULT_WIDTH * def_frame.fmt->depth) >> 3; + def_frame.size =3D def_frame.stride * DEFAULT_HEIGHT; =20 ret =3D video_register_device(vfd, VFL_TYPE_VIDEO, -1); if (ret) { diff --git a/drivers/media/platform/rockchip/rga/rga.h b/drivers/media/plat= form/rockchip/rga/rga.h index a922fac0c01a3..7ec1fcc03ed32 100644 --- a/drivers/media/platform/rockchip/rga/rga.h +++ b/drivers/media/platform/rockchip/rga/rga.h @@ -25,11 +25,6 @@ struct rga_fmt { }; =20 struct rga_frame { - /* Original dimensions */ - u32 width; - u32 height; - u32 colorspace; - /* Crop */ struct v4l2_rect crop; =20 --=20 2.52.0