[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID:
<ZQ0PR01MB1302E6647F9D1B6AC21B274CF2A52@ZQ0PR01MB1302.CHNPR01.prod.partner.outlook.cn>
Date: Thu, 11 Jul 2024 01:42:06 +0000
From: Changhuang Liang <changhuang.liang@...rfivetech.com>
To: Jacopo Mondi <jacopo.mondi@...asonboard.com>
CC: Mauro Carvalho Chehab <mchehab@...nel.org>, Greg Kroah-Hartman
<gregkh@...uxfoundation.org>, Sakari Ailus <sakari.ailus@...ux.intel.com>,
Hans Verkuil <hverkuil-cisco@...all.nl>, Laurent Pinchart
<laurent.pinchart@...asonboard.com>, Jean-Michel Hautbois
<jeanmichel.hautbois@...asonboard.com>, Benjamin Gaignard
<benjamin.gaignard@...labora.com>, Tomi Valkeinen
<tomi.valkeinen+renesas@...asonboard.com>, Mingjia Zhang
<mingjia.zhang@...iatek.com>, Jack Zhu <jack.zhu@...rfivetech.com>, Keith
Zhao <keith.zhao@...rfivetech.com>, "linux-media@...r.kernel.org"
<linux-media@...r.kernel.org>, "linux-kernel@...r.kernel.org"
<linux-kernel@...r.kernel.org>, "linux-staging@...ts.linux.dev"
<linux-staging@...ts.linux.dev>
Subject:
回复: [PATCH v5 00/14] Add ISP 3A for StarFive
Hi, Jacopo
Thanks for your comments.
>
> Hi Changhuang
>
> I've passed the series through the media-staging CI
> https://gitlab.freedesktop.org/linux-media/users/jmondi/-/pipelines/122092
> 0
> Could you check the errors reported there ?
>
Sorry, my bad, I pulled the branch too early, forget the rebase the newest, there is a conflict in PATCH 3:
<<<<<<< HEAD
/* Vendor specific - used for RaspberryPi PiSP */
#define V4L2_META_FMT_RPI_BE_CFG v4l2_fourcc('R', 'P', 'B', 'C') /* PiSP BE configuration */
=======
/* Vendor specific - used for StarFive JH7110 ISP camera sub-system */
#define V4L2_META_FMT_STF_ISP_PARAMS v4l2_fourcc('S', 'T', 'F', 'P') /* StarFive ISP 3A Parameters */
#define V4L2_META_FMT_STF_ISP_STAT_3A v4l2_fourcc('S', 'T', 'F', 'S') /* StarFive ISP 3A Statistics */
>>>>>>> 0ef1c3eb85f5 (media: videodev2.h, v4l2-ioctl: Add StarFive ISP meta buffer format)
So you didn't apply the PATCH 3.
Regards,
Changhuang
Powered by blists - more mailing lists