From mboxrd@z Thu Jan 1 00:00:00 1970 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 229DC1EEA31 for ; Thu, 21 May 2026 13:03:27 +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=1779368608; cv=none; b=sskHfn5/GkZKeFluiH+sowEsxahdqQU/xyf++uJzwV+CRBfVbTXsnAtfas9GytDO7UyfvdppYRuqIs90HI2K+apz7x8jPOYkrArsOgXyQWftXyHJ7OJw6rz28GcR+eLoFYBBHdWsNUfSL3EM3GJK/4dgvGnxeLGpPixGn23xfHM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779368608; c=relaxed/simple; bh=I28j9kLoWaLcBbB2Eh06lpqo8nF8S9y4Yy/xYsPb3Ic=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=uLfoaJ8fRhvVFneZ707izdbphkGluXQXaR1ILs8F7UMuKyQ70i88i/s9a+EvCcxWRuCw2RFO1kyP8RKgxncI0IeVsfAvMS+EgdmeCD5WhLa2WKoYE7v9cE50NQg9+kQVNr2a7RxfnVdi3yNhBnxywvgBmBgminI54wLgR2l2s9o= 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 drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1wQ33Q-0003bA-HC; Thu, 21 May 2026 15:03:12 +0200 Received: from pty.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::c5]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1wQ33O-0016fi-2f; Thu, 21 May 2026 15:03:11 +0200 Received: from mtr by pty.whiteo.stw.pengutronix.de with local (Exim 4.98.2) (envelope-from ) id 1wQ33P-00000004Vyy-10Cg; Thu, 21 May 2026 15:03:11 +0200 Date: Thu, 21 May 2026 15:03:11 +0200 From: Michael Tretter To: Sven =?utf-8?Q?P=C3=BCschel?= Cc: Jacob Chen , Ezequiel Garcia , Mauro Carvalho Chehab , Heiko Stuebner , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Hans Verkuil , 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, nicolas@ndufresne.ca, sebastian.reichel@collabora.com, p.zabel@pengutronix.de, Nicolas Dufresne Subject: Re: [PATCH v7 09/28] media: rockchip: rga: remove redundant rga_frame variables Message-ID: Mail-Followup-To: Michael Tretter , Sven =?utf-8?Q?P=C3=BCschel?= , Jacob Chen , Ezequiel Garcia , Mauro Carvalho Chehab , Heiko Stuebner , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Hans Verkuil , 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, nicolas@ndufresne.ca, sebastian.reichel@collabora.com, p.zabel@pengutronix.de, Nicolas Dufresne References: <20260521-spu-rga3-v7-0-3f33e8c7145f@pengutronix.de> <20260521-spu-rga3-v7-9-3f33e8c7145f@pengutronix.de> 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-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20260521-spu-rga3-v7-9-3f33e8c7145f@pengutronix.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: m.tretter@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 On Thu, 21 May 2026 00:44:14 +0200, Sven Püschel wrote: > 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. > > Reviewed-by: Nicolas Dufresne > Signed-off-by: Sven Püschel Reviewed-by: Michael Tretter > --- > 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 65fc0d5b4aa10..ffc6162b2e681 100644 > --- a/drivers/media/platform/rockchip/rga/rga-buf.c > +++ b/drivers/media/platform/rockchip/rga/rga-buf.c > @@ -103,10 +103,10 @@ static int get_plane_offset(struct rga_frame *f, > if (plane == 0) > return 0; > if (plane == 1) > - return stride * f->height; > + return stride * f->pix.height; > if (plane == 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); > > return -EINVAL; > } > diff --git a/drivers/media/platform/rockchip/rga/rga-hw.c b/drivers/media/platform/rockchip/rga/rga-hw.c > index d1618bb247501..ec6c17504ca15 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_addr_offset *offset, > x_div = frm->fmt->x_div; > y_div = frm->fmt->y_div; > uv_stride = frm->stride / x_div; > - pixel_width = frm->stride / frm->width; > + pixel_width = frm->stride / frm->pix.width; > > lt->y_off = offset->y_off + y * frm->stride + x * pixel_width; > lt->u_off = 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) > > 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 = RGA_SRC_CSC_MODE_BT709_R0; > break; > @@ -203,7 +203,7 @@ static void rga_cmd_set_trans_info(struct rga_ctx *ctx) > > 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 = RGA_SRC_CSC_MODE_BT709_R0; > break; > diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c > index c07207edffdb6..ca8d8a53dc251 100644 > --- a/drivers/media/platform/rockchip/rga/rga.c > +++ b/drivers/media/platform/rockchip/rga/rga.c > @@ -329,9 +329,6 @@ static struct rga_fmt *rga_fmt_find(u32 pixelformat) > } > > static struct rga_frame def_frame = { > - .width = DEFAULT_WIDTH, > - .height = DEFAULT_HEIGHT, > - .colorspace = V4L2_COLORSPACE_DEFAULT, > .crop.left = 0, > .crop.top = 0, > .crop.width = DEFAULT_WIDTH, > @@ -363,9 +360,9 @@ static int rga_open(struct file *file) > ctx->out = def_frame; > > 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); > > if (mutex_lock_interruptible(&rga->mutex)) { > kfree(ctx); > @@ -453,10 +450,8 @@ static int vidioc_g_fmt(struct file *file, void *priv, struct v4l2_format *f) > if (IS_ERR(frm)) > return PTR_ERR(frm); > > - v4l2_fill_pixfmt_mp(pix_fmt, frm->fmt->fourcc, frm->width, frm->height); > - > + *pix_fmt = frm->pix; > pix_fmt->field = V4L2_FIELD_NONE; > - pix_fmt->colorspace = frm->colorspace; > > return 0; > } > @@ -505,27 +500,24 @@ static int vidioc_s_fmt(struct file *file, void *priv, struct v4l2_format *f) > frm = rga_get_frame(ctx, f->type); > if (IS_ERR(frm)) > return PTR_ERR(frm); > - frm->width = pix_fmt->width; > - frm->height = pix_fmt->height; > frm->size = 0; > for (i = 0; i < pix_fmt->num_planes; i++) > frm->size += pix_fmt->plane_fmt[i].sizeimage; > frm->fmt = rga_fmt_find(pix_fmt->pixelformat); > frm->stride = pix_fmt->plane_fmt[0].bytesperline; > - frm->colorspace = pix_fmt->colorspace; > > /* Reset crop settings */ > frm->crop.left = 0; > frm->crop.top = 0; > - frm->crop.width = frm->width; > - frm->crop.height = frm->height; > + frm->crop.width = pix_fmt->width; > + frm->crop.height = pix_fmt->height; > > frm->pix = *pix_fmt; > > 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); > > for (i = 0; i < pix_fmt->num_planes; i++) { > @@ -579,8 +571,8 @@ static int vidioc_g_selection(struct file *file, void *priv, > } else { > s->r.left = 0; > s->r.top = 0; > - s->r.width = f->width; > - s->r.height = f->height; > + s->r.width = f->pix.width; > + s->r.height = f->pix.height; > } > > return 0; > @@ -629,8 +621,8 @@ static int vidioc_s_selection(struct file *file, void *priv, > return -EINVAL; > } > > - 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; > @@ -821,8 +813,8 @@ static int rga_probe(struct platform_device *pdev) > goto rel_m2m; > } > > - def_frame.stride = (def_frame.width * def_frame.fmt->depth) >> 3; > - def_frame.size = def_frame.stride * def_frame.height; > + def_frame.stride = (DEFAULT_WIDTH * def_frame.fmt->depth) >> 3; > + def_frame.size = def_frame.stride * DEFAULT_HEIGHT; > > ret = video_register_device(vfd, VFL_TYPE_VIDEO, -1); > if (ret) { > diff --git a/drivers/media/platform/rockchip/rga/rga.h b/drivers/media/platform/rockchip/rga/rga.h > index 477cf5b62bbb2..c4a3905a48f0d 100644 > --- a/drivers/media/platform/rockchip/rga/rga.h > +++ b/drivers/media/platform/rockchip/rga/rga.h > @@ -24,11 +24,6 @@ struct rga_fmt { > }; > > struct rga_frame { > - /* Original dimensions */ > - u32 width; > - u32 height; > - u32 colorspace; > - > /* Crop */ > struct v4l2_rect crop; > > > -- > 2.54.0 > > -- Pengutronix e.K. | Michael Tretter | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |