[PATCH v7 09/28] media: rockchip: rga: remove redundant rga_frame variables
Michael Tretter
m.tretter at pengutronix.de
Thu May 21 06:03:11 PDT 2026
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 <nicolas.dufresne at collabora.com>
> Signed-off-by: Sven Püschel <s.pueschel at pengutronix.de>
Reviewed-by: Michael Tretter <m.tretter at pengutronix.de>
> ---
> 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 |
More information about the linux-arm-kernel
mailing list