From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 90334309DD2 for ; Wed, 24 Dec 2025 15:41:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766590914; cv=none; b=kxbrxYAEc3t4MtN9y1isduKRTEDshantICJIDDsNTgPxkW4uX3E9Ffsom5vXb35MG5W0YlXIjbHMQZE1HE8rr43qmDQEuoAd4Jo0i0QPXL66t63SH0032ATPQ/cyzJHBqVCT7z/N5XBC8kA4P4mmaF+/NqljejaGH8sfWSh+AaE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766590914; c=relaxed/simple; bh=q4e3WzZjN0WuwnpIGdENnKoX1cKTLBSo0IVQyfj7m4Y=; h=Message-ID:Subject:From:To:Cc:Date:In-Reply-To:References: Content-Type:MIME-Version; b=q8pJ1n/xNJ3OSJ1DKQvn+F1RVLmaq71rytmWJhRmbjwcXn2GfMWmqgFS6W+pSRbGTnxsLSb//zaORquXqi4qBIf/tvf81dOpz5sJ5k2ESU8C4Jlw6buoL6i6d8mXelWzIadrPjSXUqWkS5Iv6dLXMQMbny5Yc61ds9Bc3oJNtsE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ndufresne.ca; spf=pass smtp.mailfrom=ndufresne.ca; dkim=pass (2048-bit key) header.d=ndufresne-ca.20230601.gappssmtp.com header.i=@ndufresne-ca.20230601.gappssmtp.com header.b=VwYaBYqU; arc=none smtp.client-ip=209.85.219.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ndufresne.ca Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ndufresne.ca Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ndufresne-ca.20230601.gappssmtp.com header.i=@ndufresne-ca.20230601.gappssmtp.com header.b="VwYaBYqU" Received: by mail-qv1-f42.google.com with SMTP id 6a1803df08f44-8888a1c50e8so77182306d6.0 for ; Wed, 24 Dec 2025 07:41:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ndufresne-ca.20230601.gappssmtp.com; s=20230601; t=1766590906; x=1767195706; darn=vger.kernel.org; h=mime-version:user-agent:autocrypt:references:in-reply-to:date:cc:to :from:subject:message-id:from:to:cc:subject:date:message-id:reply-to; bh=4cJOp3Zboju26ptOSTfN4m6v5W2HkANfWbhd+iDMpdY=; b=VwYaBYqUBygaeqDFw0GapdB1jen4YKrjLT1WM/+ZIpshQ/nYncyvrzbqhwP5gBqRny FiUVCMvUabr5StGb1Dtf0J2wOjC6uX7GNKs1vvelAlIJOImDoE2ik2m4tttMIEETUCL5 BJmWRbkV56xuR8tiGIaqzdvD9INdUh/BmCC7FT2YcQbVjUnzzrFjY/1Pvb7imgm0ABIL XdmfiIy2WUgtN6e2s1oaqjuzFljxtUv3ZlYQjh2JtJRDuIczK0k60G4U2YZM45S2nKM2 eoJwchY+6IeWzDLlHj8XbXyn0NiQJQBkXua+D9EyVLxxrAqIm89RE+fuKTzYP2CXCfr9 zbLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766590906; x=1767195706; h=mime-version:user-agent:autocrypt:references:in-reply-to:date:cc:to :from:subject:message-id:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4cJOp3Zboju26ptOSTfN4m6v5W2HkANfWbhd+iDMpdY=; b=BtlQ+Ciz2Moi55ubo22lUAue3HDvjlrlfL4crEFuLJik5dC/COVli2guvOxkBS+bxe PEl43BZ9o4+7k5xfV4ure3b7qAghD+Q7qVPP7kx1PrH1LeQ085jkyx4TW8bogVOoMGe0 VgJIZ3yQSe6Zt9tg8zyzTrDiYGE1R/vPm2er8ciEGHJgBOqoR+gh/g0sR6TH6rvUZMiq 0Zmwm2yoFMyHCO/n6Mhansfk6pOFgvD77kmgG5aR8VzETv/kMjflXsVSf6MDccsZlRi3 Y82bY5/QcoXTSwFU2gu3rPNC+tM4j9ecFa/OBFcgtCvhqqkwklvTKwWQQEAduwMW7hrm 0nXg== X-Forwarded-Encrypted: i=1; AJvYcCW9yhAqaqW7Hn+2K8F6Z/mpNlpSp2BdnjuGtjpcBH1eOnR1sUFl42q6TP0yiwjTfV3pe33VMNv05wYZCYI=@vger.kernel.org X-Gm-Message-State: AOJu0YwZk1qQM27n4SXkzfy/Ai2KXlcuSFffV62qPwLPpYStt6e0w6hk XgY1xoC0BSxBgfIu4mhowQOSd/UQSeUqqshblxweo97km8psoSyKckHxGS571ySJDrQ3pGzdMjB vUOgpOBc= X-Gm-Gg: AY/fxX6jrNKjOjERR/WAocs8qomaDSFDFTBPF+EzAGrSvPRi9Ik4wnQqKMy6WGs+N3l RzzToiVAmLaAKfbDnmOma0AD3HcD8aA8GltCgXkI8EHRKfdvuSJaaVde9a2H9WMAv1oxlEq62Wk 99nIXVLllxTo7goDt6zi29oqtDJeYzZ6fj/8yNfZdj/LEV6qqaZlXZKvB/JxKJP/9vooYUM9gCS iO6T9IDCmRLzzBQ3UTFfXWwHlXsg7qNtZUcrQcu00k3YKUKvPrz+MNW2cKbmq0u/8iYifqEtwAo SQ2MsLAe0EPWxkqwqzu5RUJFag/dQx6m4MXi5MwJEcqezwFcApHhVPmpbCIruAeyUhbCTgG6WRs tUNEAWQQoIHsQ3brBUQ5e+Lw6RcuXwdO57w3SUmogQtSdYur7Sds7s3aiUfRQraj0GbEpvCJWQJ bEd2ArpYSM3lNEyC7o X-Google-Smtp-Source: AGHT+IFRtbG+elw5PxYXalq9TAz4TzE+scokfylcO9+kWGqouFNI8oSQuaZmk5NwD0U1SvtgeX582A== X-Received: by 2002:a0c:c3d0:0:b0:889:b6f1:1f30 with SMTP id 6a1803df08f44-88d825257f0mr266398716d6.18.1766590906084; Wed, 24 Dec 2025 07:41:46 -0800 (PST) Received: from ?IPv6:2606:6d00:17:7b4b::c41? ([2606:6d00:17:7b4b::c41]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-88d9a741365sm131235296d6.53.2025.12.24.07.41.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Dec 2025 07:41:45 -0800 (PST) Message-ID: <32a69cd80152bb7f52743a609a4c15cb56d008a2.camel@ndufresne.ca> Subject: Re: [PATCH v2 13/22] media: rockchip: rga: change offset to dma_addresses From: Nicolas Dufresne To: Sven =?ISO-8859-1?Q?P=FCschel?= , 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 Date: Wed, 24 Dec 2025 10:41:44 -0500 In-Reply-To: <20251203-spu-rga3-v2-13-989a67947f71@pengutronix.de> References: <20251203-spu-rga3-v2-0-989a67947f71@pengutronix.de> <20251203-spu-rga3-v2-13-989a67947f71@pengutronix.de> Autocrypt: addr=nicolas@ndufresne.ca; prefer-encrypt=mutual; keydata=mDMEaCN2ixYJKwYBBAHaRw8BAQdAM0EHepTful3JOIzcPv6ekHOenE1u0vDG1gdHFrChD /e0J05pY29sYXMgRHVmcmVzbmUgPG5pY29sYXNAbmR1ZnJlc25lLmNhPoicBBMWCgBEAhsDBQsJCA cCAiICBhUKCQgLAgQWAgMBAh4HAheABQkJZfd1FiEE7w1SgRXEw8IaBG8S2UGUUSlgcvQFAmibrjo CGQEACgkQ2UGUUSlgcvQlQwD/RjpU1SZYcKG6pnfnQ8ivgtTkGDRUJ8gP3fK7+XUjRNIA/iXfhXMN abIWxO2oCXKf3TdD7aQ4070KO6zSxIcxgNQFtDFOaWNvbGFzIER1ZnJlc25lIDxuaWNvbGFzLmR1Z nJlc25lQGNvbGxhYm9yYS5jb20+iJkEExYKAEECGwMFCwkIBwICIgIGFQoJCAsCBBYCAwECHgcCF4 AWIQTvDVKBFcTDwhoEbxLZQZRRKWBy9AUCaCyyxgUJCWX3dQAKCRDZQZRRKWBy9ARJAP96pFmLffZ smBUpkyVBfFAf+zq6BJt769R0al3kHvUKdgD9G7KAHuioxD2v6SX7idpIazjzx8b8rfzwTWyOQWHC AAS0LU5pY29sYXMgRHVmcmVzbmUgPG5pY29sYXMuZHVmcmVzbmVAZ21haWwuY29tPoiZBBMWCgBBF iEE7w1SgRXEw8IaBG8S2UGUUSlgcvQFAmibrGYCGwMFCQll93UFCwkIBwICIgIGFQoJCAsCBBYCAw ECHgcCF4AACgkQ2UGUUSlgcvRObgD/YnQjfi4+L8f4fI7p1pPMTwRTcaRdy6aqkKEmKsCArzQBAK8 bRLv9QjuqsE6oQZra/RB4widZPvphs78H0P6NmpIJ Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-XzIQ9JAoskxiG+mb7m7O" User-Agent: Evolution 3.58.2 (3.58.2-1.fc43) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 --=-XzIQ9JAoskxiG+mb7m7O Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi, Le mercredi 03 d=C3=A9cembre 2025 =C3=A0 16:52 +0100, Sven P=C3=BCschel a = =C3=A9crit=C2=A0: > Change the offset to dma_addresses, as the current naming is misleading. > The offset naming comes from the fact that it references the offset in > the mapped iommu address space. But from the hardware point of view this > is an address, as also pointed out by the register naming > (e.g. RGA_DST_Y_RGB_BASE_ADDR). Therefore also change the type to > dma_addr_t, as with an external iommu driver this would also be the > correct type. >=20 > This change is a preparation for the RGA3 support, which uses an external > iommu and therefore just gets an dma_addr_t for each buffer. The field > renaming allows to reuse the existing fields of rga_vb_buffer to store > these values. >=20 > Signed-off-by: Sven P=C3=BCschel Reviewed-by: Nicolas Dufresne > --- > =C2=A0drivers/media/platform/rockchip/rga/rga-buf.c |=C2=A0 12 +-- > =C2=A0drivers/media/platform/rockchip/rga/rga-hw.c=C2=A0 | 105 ++++++++++= +++------------ > - > =C2=A0drivers/media/platform/rockchip/rga/rga.h=C2=A0=C2=A0=C2=A0=C2=A0 |= =C2=A0 12 +-- > =C2=A03 files changed, 64 insertions(+), 65 deletions(-) >=20 > diff --git a/drivers/media/platform/rockchip/rga/rga-buf.c > b/drivers/media/platform/rockchip/rga/rga-buf.c > index 0c59a4d330888..8845e1f894f29 100644 > --- a/drivers/media/platform/rockchip/rga/rga-buf.c > +++ b/drivers/media/platform/rockchip/rga/rga-buf.c > @@ -118,7 +118,7 @@ static int rga_buf_prepare(struct vb2_buffer *vb) > =C2=A0 size_t curr_desc =3D 0; > =C2=A0 int i; > =C2=A0 const struct v4l2_format_info *info; > - unsigned int offsets[VIDEO_MAX_PLANES]; > + unsigned int dma_addrs[VIDEO_MAX_PLANES]; > =C2=A0 > =C2=A0 if (IS_ERR(f)) > =C2=A0 return PTR_ERR(f); > @@ -142,18 +142,18 @@ static int rga_buf_prepare(struct vb2_buffer *vb) > =C2=A0 "Failed to map video buffer to RGA\n"); > =C2=A0 return n_desc; > =C2=A0 } > - offsets[i] =3D curr_desc << PAGE_SHIFT; > + dma_addrs[i] =3D curr_desc << PAGE_SHIFT; > =C2=A0 curr_desc +=3D n_desc; > =C2=A0 } > =C2=A0 > =C2=A0 /* Fill the remaining planes */ > =C2=A0 info =3D v4l2_format_info(f->fmt->fourcc); > =C2=A0 for (i =3D info->mem_planes; i < info->comp_planes; i++) > - offsets[i] =3D get_plane_offset(f, info, i); > + dma_addrs[i] =3D dma_addrs[0] + get_plane_offset(f, info, i); > =C2=A0 > - rbuf->offset.y_off =3D offsets[0]; > - rbuf->offset.u_off =3D offsets[1]; > - rbuf->offset.v_off =3D offsets[2]; > + rbuf->dma_addrs.y_addr =3D dma_addrs[0]; > + rbuf->dma_addrs.u_addr =3D dma_addrs[1]; > + rbuf->dma_addrs.v_addr =3D dma_addrs[2]; > =C2=A0 > =C2=A0 return 0; > =C2=A0} > diff --git a/drivers/media/platform/rockchip/rga/rga-hw.c > b/drivers/media/platform/rockchip/rga/rga-hw.c > index 8953960d33bc5..fe6f518aedd4e 100644 > --- a/drivers/media/platform/rockchip/rga/rga-hw.c > +++ b/drivers/media/platform/rockchip/rga/rga-hw.c > @@ -16,11 +16,11 @@ enum e_rga_start_pos { > =C2=A0 RB =3D 3, > =C2=A0}; > =C2=A0 > -struct rga_corners_addr_offset { > - struct rga_addr_offset left_top; > - struct rga_addr_offset right_top; > - struct rga_addr_offset left_bottom; > - struct rga_addr_offset right_bottom; > +struct rga_corners_addrs { > + struct rga_addrs left_top; > + struct rga_addrs right_top; > + struct rga_addrs left_bottom; > + struct rga_addrs right_bottom; > =C2=A0}; > =C2=A0 > =C2=A0static unsigned int rga_get_scaling(unsigned int src, unsigned int = dst) > @@ -36,48 +36,47 @@ static unsigned int rga_get_scaling(unsigned int src, > unsigned int dst) > =C2=A0 return (src > dst) ? ((dst << 16) / src) : ((src << 16) / dst); > =C2=A0} > =C2=A0 > -static struct rga_corners_addr_offset > -rga_get_addr_offset(struct rga_frame *frm, struct rga_addr_offset *offse= t, > - =C2=A0=C2=A0=C2=A0 unsigned int x, unsigned int y, unsigned int w, uns= igned > int h) > +static struct rga_corners_addrs > +rga_get_corner_addrs(struct rga_frame *frm, struct rga_addrs *addrs, > + =C2=A0=C2=A0=C2=A0=C2=A0 unsigned int x, unsigned int y, unsigned int = w, unsigned > int h) > =C2=A0{ > - struct rga_corners_addr_offset offsets; > - struct rga_addr_offset *lt, *lb, *rt, *rb; > + struct rga_corners_addrs corner_addrs; > + struct rga_addrs *lt, *lb, *rt, *rb; > =C2=A0 unsigned int x_div =3D 0, > =C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0 y_div =3D 0, uv_stride =3D 0, pixel_widt= h =3D 0; > =C2=A0 > - lt =3D &offsets.left_top; > - lb =3D &offsets.left_bottom; > - rt =3D &offsets.right_top; > - rb =3D &offsets.right_bottom; > + lt =3D &corner_addrs.left_top; > + lb =3D &corner_addrs.left_bottom; > + rt =3D &corner_addrs.right_top; > + rb =3D &corner_addrs.right_bottom; > =C2=A0 > =C2=A0 x_div =3D frm->fmt->x_div; > =C2=A0 y_div =3D frm->fmt->y_div; > =C2=A0 uv_stride =3D frm->stride / x_div; > =C2=A0 pixel_width =3D frm->stride / frm->pix.width; > =C2=A0 > - 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; > - lt->v_off =3D offset->v_off + (y / y_div) * uv_stride + x / x_div; > + lt->y_addr =3D addrs->y_addr + y * frm->stride + x * pixel_width; > + lt->u_addr =3D addrs->u_addr + (y / y_div) * uv_stride + x / x_div; > + lt->v_addr =3D addrs->v_addr + (y / y_div) * uv_stride + x / x_div; > =C2=A0 > - lb->y_off =3D lt->y_off + (h - 1) * frm->stride; > - lb->u_off =3D lt->u_off + (h / y_div - 1) * uv_stride; > - lb->v_off =3D lt->v_off + (h / y_div - 1) * uv_stride; > + lb->y_addr =3D lt->y_addr + (h - 1) * frm->stride; > + lb->u_addr =3D lt->u_addr + (h / y_div - 1) * uv_stride; > + lb->v_addr =3D lt->v_addr + (h / y_div - 1) * uv_stride; > =C2=A0 > - rt->y_off =3D lt->y_off + (w - 1) * pixel_width; > - rt->u_off =3D lt->u_off + w / x_div - 1; > - rt->v_off =3D lt->v_off + w / x_div - 1; > + rt->y_addr =3D lt->y_addr + (w - 1) * pixel_width; > + rt->u_addr =3D lt->u_addr + w / x_div - 1; > + rt->v_addr =3D lt->v_addr + w / x_div - 1; > =C2=A0 > - rb->y_off =3D lb->y_off + (w - 1) * pixel_width; > - rb->u_off =3D lb->u_off + w / x_div - 1; > - rb->v_off =3D lb->v_off + w / x_div - 1; > + rb->y_addr =3D lb->y_addr + (w - 1) * pixel_width; > + rb->u_addr =3D lb->u_addr + w / x_div - 1; > + rb->v_addr =3D lb->v_addr + w / x_div - 1; > =C2=A0 > - return offsets; > + return corner_addrs; > =C2=A0} > =C2=A0 > -static struct rga_addr_offset *rga_lookup_draw_pos(struct > - rga_corners_addr_offset > - * offsets, u32 rotate_mode, > - u32 mirr_mode) > +static struct rga_addrs *rga_lookup_draw_pos(struct rga_corners_addrs > *corner_addrs, > + =C2=A0=C2=A0=C2=A0=C2=A0 u32 rotate_mode, > + =C2=A0=C2=A0=C2=A0=C2=A0 u32 mirr_mode) > =C2=A0{ > =C2=A0 static enum e_rga_start_pos rot_mir_point_matrix[4][4] =3D { > =C2=A0 { > @@ -94,18 +93,18 @@ static struct rga_addr_offset *rga_lookup_draw_pos(st= ruct > =C2=A0 }, > =C2=A0 }; > =C2=A0 > - if (!offsets) > + if (!corner_addrs) > =C2=A0 return NULL; > =C2=A0 > =C2=A0 switch (rot_mir_point_matrix[rotate_mode][mirr_mode]) { > =C2=A0 case LT: > - return &offsets->left_top; > + return &corner_addrs->left_top; > =C2=A0 case LB: > - return &offsets->left_bottom; > + return &corner_addrs->left_bottom; > =C2=A0 case RT: > - return &offsets->right_top; > + return &corner_addrs->right_top; > =C2=A0 case RB: > - return &offsets->right_bottom; > + return &corner_addrs->right_bottom; > =C2=A0 } > =C2=A0 > =C2=A0 return NULL; > @@ -307,9 +306,9 @@ static void rga_cmd_set_trans_info(struct rga_ctx *ct= x) > =C2=A0} > =C2=A0 > =C2=A0static void rga_cmd_set_src_info(struct rga_ctx *ctx, > - struct rga_addr_offset *offset) > + struct rga_addrs *addrs) > =C2=A0{ > - struct rga_corners_addr_offset src_offsets; > + struct rga_corners_addrs src_corner_addrs; > =C2=A0 u32 *dest =3D ctx->cmdbuf_virt; > =C2=A0 unsigned int src_h, src_w, src_x, src_y; > =C2=A0 > @@ -321,22 +320,22 @@ static void rga_cmd_set_src_info(struct rga_ctx *ct= x, > =C2=A0 /* > =C2=A0 * Calculate the source framebuffer base address with offset pixel= . > =C2=A0 */ > - src_offsets =3D rga_get_addr_offset(&ctx->in, offset, > - =C2=A0 src_x, src_y, src_w, src_h); > + src_corner_addrs =3D rga_get_corner_addrs(&ctx->in, addrs, > + src_x, src_y, src_w, src_h); > =C2=A0 > =C2=A0 dest[(RGA_SRC_Y_RGB_BASE_ADDR - RGA_MODE_BASE_REG) >> 2] =3D > - src_offsets.left_top.y_off; > + src_corner_addrs.left_top.y_addr; > =C2=A0 dest[(RGA_SRC_CB_BASE_ADDR - RGA_MODE_BASE_REG) >> 2] =3D > - src_offsets.left_top.u_off; > + src_corner_addrs.left_top.u_addr; > =C2=A0 dest[(RGA_SRC_CR_BASE_ADDR - RGA_MODE_BASE_REG) >> 2] =3D > - src_offsets.left_top.v_off; > + src_corner_addrs.left_top.v_addr; > =C2=A0} > =C2=A0 > =C2=A0static void rga_cmd_set_dst_info(struct rga_ctx *ctx, > - struct rga_addr_offset *offset) > + struct rga_addrs *addrs) > =C2=A0{ > - struct rga_addr_offset *dst_offset; > - struct rga_corners_addr_offset offsets; > + struct rga_addrs *dst_addrs; > + struct rga_corners_addrs corner_addrs; > =C2=A0 u32 *dest =3D ctx->cmdbuf_virt; > =C2=A0 unsigned int dst_h, dst_w, dst_x, dst_y; > =C2=A0 unsigned int mir_mode =3D 0; > @@ -370,15 +369,15 @@ static void rga_cmd_set_dst_info(struct rga_ctx *ct= x, > =C2=A0 /* > =C2=A0 * Configure the dest framebuffer base address with pixel offset. > =C2=A0 */ > - offsets =3D rga_get_addr_offset(&ctx->out, offset, dst_x, dst_y, dst_w, > dst_h); > - dst_offset =3D rga_lookup_draw_pos(&offsets, rot_mode, mir_mode); > + corner_addrs =3D rga_get_corner_addrs(&ctx->out, addrs, dst_x, dst_y, > dst_w, dst_h); > + dst_addrs =3D rga_lookup_draw_pos(&corner_addrs, rot_mode, mir_mode); > =C2=A0 > =C2=A0 dest[(RGA_DST_Y_RGB_BASE_ADDR - RGA_MODE_BASE_REG) >> 2] =3D > - dst_offset->y_off; > + dst_addrs->y_addr; > =C2=A0 dest[(RGA_DST_CB_BASE_ADDR - RGA_MODE_BASE_REG) >> 2] =3D > - dst_offset->u_off; > + dst_addrs->u_addr; > =C2=A0 dest[(RGA_DST_CR_BASE_ADDR - RGA_MODE_BASE_REG) >> 2] =3D > - dst_offset->v_off; > + dst_addrs->v_addr; > =C2=A0} > =C2=A0 > =C2=A0static void rga_cmd_set_mode(struct rga_ctx *ctx) > @@ -417,8 +416,8 @@ static void rga_cmd_set(struct rga_ctx *ctx, > =C2=A0 > =C2=A0 rga_cmd_set_dst_addr(ctx, dst->dma_desc_pa); > =C2=A0 > - rga_cmd_set_src_info(ctx, &src->offset); > - rga_cmd_set_dst_info(ctx, &dst->offset); > + rga_cmd_set_src_info(ctx, &src->dma_addrs); > + rga_cmd_set_dst_info(ctx, &dst->dma_addrs); > =C2=A0 > =C2=A0 rga_write(rga, RGA_CMD_BASE, ctx->cmdbuf_phy); > =C2=A0 > diff --git a/drivers/media/platform/rockchip/rga/rga.h > b/drivers/media/platform/rockchip/rga/rga.h > index ee50f7f3ed601..772f7dff9a8e5 100644 > --- a/drivers/media/platform/rockchip/rga/rga.h > +++ b/drivers/media/platform/rockchip/rga/rga.h > @@ -98,10 +98,10 @@ struct rockchip_rga { > =C2=A0 const struct rga_hw *hw; > =C2=A0}; > =C2=A0 > -struct rga_addr_offset { > - unsigned int y_off; > - unsigned int u_off; > - unsigned int v_off; > +struct rga_addrs { > + dma_addr_t y_addr; > + dma_addr_t u_addr; > + dma_addr_t v_addr; > =C2=A0}; > =C2=A0 > =C2=A0struct rga_vb_buffer { > @@ -113,8 +113,8 @@ struct rga_vb_buffer { > =C2=A0 dma_addr_t dma_desc_pa; > =C2=A0 size_t n_desc; > =C2=A0 > - /* Plane offsets of this buffer into the mapping */ > - struct rga_addr_offset offset; > + /* Plane DMA addresses after the MMU mapping of the buffer */ > + struct rga_addrs dma_addrs; > =C2=A0}; > =C2=A0 > =C2=A0static inline struct rga_vb_buffer *vb_to_rga(struct vb2_v4l2_buffe= r *vb) --=-XzIQ9JAoskxiG+mb7m7O Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQTvDVKBFcTDwhoEbxLZQZRRKWBy9AUCaUwJuAAKCRDZQZRRKWBy 9C0sAQC7c89Ua60SBcVOxT2Qj8jM9tBwHZPJeIfiTWHDiHLo0QEA4pzupbY+wPXZ x2kZ7zYoDcdYGsX+Hg8f2ELtK7LCfQ8= =amzr -----END PGP SIGNATURE----- --=-XzIQ9JAoskxiG+mb7m7O--