From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.128.42 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793627823; b=a7MIn/dcXh4YSeAMtsN+eGJYfl0RhxWiKGCRWZaCN7ShoN3DivVCEWgPwrN2Mhoq5Lhj 1Vo59kltMtk1VvmuF/fOzUtuBrNzo1DoLtNEdFXfUWqE7J8YAzEt9Gkgxf8BDqKtae9sS tcZ43+atWWm9OMqc6+p1ylG7rW438UJBGYvyjxRg1PS7msaRTJGDeX4Aa788SIOae+9kT fAByOlgFxavAbSe6hjMQ6sNPS/o7nwdK1Tv9lTKFAs57CQTTtYsC3/GNSWCNHL3Qy6guL 1YJil/ktvUQH/ndQDOPNDFQ02PAeaRNX+oNo/G2DOcpi0G3K9Qud4ZlLOxGQM9BF6JA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793627823; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Gm-Message-State:X-Gm-Gg:X-Received:Received:From: X-Google-Original-From:Date:Subject:MIME-Version:Content-Type: Content-Transfer-Encoding:Message-Id:References:In-Reply-To:To:Cc: X-Mailer:X-Developer-Signature:X-Developer-Key; bh=35TvIgk5LQeEzcO1qBoj4/zaSsKIVhaoQZrYAuyxSeE=; b=Gd+AjYjMjWcXAkb/m2Jolkku0JrCEvimhPVAtRaTk0EET48RCVDBBK35vy9hSfxHlj6M deUa1M8DvjrL7wCLViQ0XULbooI2LAoat7v9SHcsLbnloWAkArGOOnXNeTfXdrd4wXzLW tw5XgLFqjrJK2p/UeYaWxyC1UtAc5SmGqPVwnjZAd6C4iM0iuphnb51eVdVsrovUEdzZL 6lGpmMfafblofEKHqpFZMYr1FJPnwoarUMf4b6loIoAtgwM5J24tl6BwfAxClrpU0Zcan UgGBh03xmrp3lOvSLTwfjT8iLBoXRf6mOihOjkmOFYMQoGwKEECLHvy/xOfbq9kBKSg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=CiybWnHD; arc=none smtp.remote-ip=209.85.128.42 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B446460A262C for ; Mon, 2 Nov 2026 13:57:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org B446460A262C Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=CiybWnHD Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-4a218c463d1so20297735e9.0 for ; Mon, 02 Nov 2026 05:57:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1793627821; x=1794232621; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=35TvIgk5LQeEzcO1qBoj4/zaSsKIVhaoQZrYAuyxSeE=; b=CiybWnHDFQkoe75XpWZpVjuVMlXNSUJBgrGf95tEXBktDpEuez4oRKWqRRAddRD/Vc AqY3vn6NjguW1nx4RCVUvPwYzsBiqk21Xj1SAd4S5JfA2Iq1xDbknHmgtPgZaX53zv35 FTz1mm4pCvlIFgtF4YycSk0xr38FEuCCbE/YioUkb7VhvruEC2RzlcUSe435uOuKwTss bnCQuarewNAtx+BfUN/4ns8KIX/gdYY2NDkCe0xeaCYXn8lLeJcSzhOKrzKg4Y0xW6xz Ravwa/SSP1A16A5DdsLjwXgciqSacf8JCfjFvI6ipCYqjoV/GbEU8VSdLiEu9+3PQbSB v/Dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793627821; x=1794232621; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=35TvIgk5LQeEzcO1qBoj4/zaSsKIVhaoQZrYAuyxSeE=; b=TOfMFniOj8VF0pxgRUyWnl/bnx/Bsab6YAVVMvV5RYgMVlC4tiFtk35X910ryHd/L9 WWLWU6RNtH5aG0wCB7I+PGWuWvE/fmJzax4tgIMeSUl0NZnFAVtu9FW7ixyazpyGB/nD jAa3Dux3+zrBWJqgcqVgRxL1O43TiM6M9lPrE4jmsyuEKCnX1fmJNLz9eNo+HiGL05OL e3mTHKZVY8Yc9+3SiOJMA1jlEBHSPFSUrEuF1wEnytGd4MFw9ZkiJvWMoMGzceTXyyQj MBn0DLsQABzzu8CdhiY3qzod4FSAHc91QIWaZ9tNUbajxLmXqM7WhO7uhyE26UcDoYIo c0Fg== X-Gm-Message-State: AFq9FYJRHGAS9B4uGavAaPK8PuTkjWw4V6Zfoce1BW9pqIlcWNl5fV3i sqAIrqI/pGJRG+LXqKkTZH+oBqj+COaJSWBrI2xBRm9QtQmDKekcvopBfJZ6QRcG4YA= X-Gm-Gg: AYBFou2g8kbua30XRgsj3LnvDSl5zFMgXEYlaShQH3dG1orfptCt8L86Jo5tZGOBHk1 /lslFFum32Rw3ZGZZTStvT+jT9RJiZ2JiiYW1Z9lmfasb2oVVoiJ4SNuCd6AB5HFVbeKDiBOlAB mTz1kL0mwj+jVYBWjH6H84y1ewIZ1g/EYJbe65zABhT7/1Wavhko1qLBMLei6xa+x0rPJWTgje5 R890hFq85nFhQ/RHl4E1uEK1GMaSKTYxbqI6aYC6IRWUqKvAuLPy9My0EfYg8QwgHE1KuKzb2TR H505xu5X+FEwLBdOzdowKu73UF18zS7BjkRyaFsdA/KHJBGR8jC4Wo8OBpFNY/1VpGTjNBtpHO6 vxZUHWrsGlml+rZeZUr3syaZDZFgXxbxHKerxu/F7M9Kd9jOghMbQAKCupOCl4sNPEPmtW3QFot pVazIxibUKhM7DEbDYZ4kxpWQ4sJavACphAz6mu8xtwc1/vuXJtF95NVputjeW9bUPPpRpX8OpN b408VCulWBdi/TRrFScxVfTJc0Sxfnasm6/aNpBMUpoqlQg9d5/hxL2lfI4RwY0eD5qTb7+UlBE IBgforh5Wwhr4kTeJw== X-Received: by 2002:a05:600c:4fd4:b0:4a1:e250:b191 with SMTP id 5b1f17b1804b1-4ac180f2ff3mr227508685e9.17.1793627821098; Mon, 02 Nov 2026 05:57:01 -0800 (PST) Received: from [127.0.0.1] ([64.43.42.35]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4abe77053fesm126145375e9.0.2026.11.02.05.57.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2026 05:57:00 -0800 (PST) From: bryan.odonoghue@linaro.org X-Google-Original-From: bod@kernel.org Date: Mon, 02 Nov 2026 13:56:49 +0000 Subject: [PATCH v2 3/9] media: qcom: camss: Use SOF sequence tracking for vb.sequence X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261102-v4l2-frame-sync-v2-3-25cbed7a772f@kernel.org> References: <20261102-v4l2-frame-sync-v2-0-25cbed7a772f@kernel.org> In-Reply-To: <20261102-v4l2-frame-sync-v2-0-25cbed7a772f@kernel.org> To: Bryan O'Donoghue , Vladimir Zapolskiy , Loic Poulain , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4680; i=bod@kernel.org; h=from:subject:message-id; bh=bufVP28tKn3rZTY/gAilL+mmCSo1VexolPFYOZDSE6E=; b=owEBbQKS/ZANAwAKASJxO7Ohjcg6AcsmYgBq6JalPo3tzd6P7pCVbvU92X2ft5op9kKzglOQj Wd/xnh00HaJAjMEAAEKAB0WIQTmk/sqq6Nt4Rerb7QicTuzoY3IOgUCauiWpQAKCRAicTuzoY3I OjLvD/9JPG4584a3LT7W+VeC/2TRjimq2JmuY6Xc/1lWKS068cit36iRPuVhOvXlsQimo3darEq ogOpIRcGBWGKDYtXscxqVbTNpmLfW1qJfVSbrkAJsdpKke5XJ1s6VfdITP13J/fYiq09MJ7WGTW cdKjazMfSP5qAnk4Dr+/gNCF+kCrGgOeXMIM9jjl7WaCQTDpgogldBdLwmjaAcPw2ztcunvUB1f w5vWkRvpvbX1KSPUVnKOrQcKUMA+IqFPAlnpgPR+HP8mxWcsVRMuFjkJgQyeF4N1850plFXWdpR 6iTnisk78JMxj6o4kG7a3L3uyUe1Bme6uN1snj1/p/tcBg7vlJMG24jxPdLksbJQV95TQGJHOE0 VmCWwfP5TPv/dZW5ciRN/UlgtEaB5/CqMZnC7OW1x993Dt7rNvbGo9ym79Z4Br7KmWOdWQhV519 7RYHkN+3PMpLwSB5VrEbagbhNmTGAynkXcxs9Zp/cF48jUyqaSsjQ+KP8ENcx1Q2NEWo6Cjesjn acQUZ01Xs5a3a85QQcXLGsINa+jDtxf2o1j52j9c8gaiOOZoPyRUNRMfRLtE3250eeAmpdFTKcG mNp5tCBEGkh3vCt0z2vv6mvMf99mcAVz9xI0SJHV3UnOY4l4Z//S/eHI4T7kL+suLlHbDJugJBh T3JI8Lwa097nMTA== X-Developer-Key: i=bod@kernel.org; a=openpgp; fpr=E693FB2AABA36DE117AB6FB422713BB3A18DC83A From: Bryan O'Donoghue We want to correlate statistics buffers with data-buffers. To do that we will need to have a sequence number driven by the SOF signal. Rather than incrementing vb.sequence when data arrives, we should increment when SOF happens. Signed-off-by: Bryan O'Donoghue --- drivers/media/platform/qcom/camss/camss-csid.c | 14 ++++++++++++++ drivers/media/platform/qcom/camss/camss-csid.h | 9 +++++++++ drivers/media/platform/qcom/camss/camss-vfe-17x.c | 5 ++++- drivers/media/platform/qcom/camss/camss-vfe.c | 9 ++++++++- drivers/media/platform/qcom/camss/camss-vfe.h | 1 + 5 files changed, 36 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/qcom/camss/camss-csid.c b/drivers/media/platform/qcom/camss/camss-csid.c index e9b399fcb9c7a..4f4ed4fa46aac 100644 --- a/drivers/media/platform/qcom/camss/camss-csid.c +++ b/drivers/media/platform/qcom/camss/camss-csid.c @@ -1355,6 +1355,20 @@ static int csid_subscribe_event(struct v4l2_subdev *sd, struct v4l2_fh *fh, return v4l2_event_subscribe(fh, sub, 0, &csid_frame_sync_ops); } +atomic_t *csid_get_sof_seq(struct media_pad *pad) +{ + struct csid_device *csid; + + if (!pad || pad->index < MSM_CSID_PAD_FIRST_SRC) + return NULL; + + csid = v4l2_get_subdevdata(media_entity_to_v4l2_subdev(pad->entity)); + if (!csid->res->frame_sync_en) + return NULL; + + return &csid->sof_seq[pad->index - MSM_CSID_PAD_FIRST_SRC]; +} + void csid_sof_event(struct csid_device *csid, unsigned int id) { struct v4l2_event event = { diff --git a/drivers/media/platform/qcom/camss/camss-csid.h b/drivers/media/platform/qcom/camss/camss-csid.h index 2e48b08b93592..f3199579e3442 100644 --- a/drivers/media/platform/qcom/camss/camss-csid.h +++ b/drivers/media/platform/qcom/camss/camss-csid.h @@ -260,4 +260,13 @@ u32 csid_src_pad_code(struct csid_device *csid, u32 sink_code, */ void csid_sof_event(struct csid_device *csid, unsigned int id); +/* + * csid_get_sof_seq - Get a pointer to the SOF frame sequence variable. + * @pad: Remote pad of a consumer's sink pad + * + * Return the counter or NULL if @pad isn't a CSID or the CSID doesn't support + * SOF tracking. + */ +atomic_t *csid_get_sof_seq(struct media_pad *pad); + #endif /* QC_MSM_CAMSS_CSID_H */ diff --git a/drivers/media/platform/qcom/camss/camss-vfe-17x.c b/drivers/media/platform/qcom/camss/camss-vfe-17x.c index 62c2405359a06..4972d3ab65078 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe-17x.c +++ b/drivers/media/platform/qcom/camss/camss-vfe-17x.c @@ -491,7 +491,10 @@ static void vfe_isr_wm_done(struct vfe_device *vfe, u8 wm) } ready_buf->vb.vb2_buf.timestamp = ts; - ready_buf->vb.sequence = output->sequence++; + if (line->sof_seq) + ready_buf->vb.sequence = atomic_read(line->sof_seq); + else + ready_buf->vb.sequence = output->sequence++; index = 0; output->buf[0] = output->buf[1]; diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c index 2680a9914765f..da373024c847e 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe.c +++ b/drivers/media/platform/qcom/camss/camss-vfe.c @@ -474,7 +474,10 @@ void vfe_buf_done(struct vfe_device *vfe, int wm) } ready_buf->vb.vb2_buf.timestamp = ts; - ready_buf->vb.sequence = output->sequence++; + if (line->sof_seq) + ready_buf->vb.sequence = atomic_read(line->sof_seq); + else + ready_buf->vb.sequence = output->sequence++; index = 0; output->buf[0] = output->buf[1]; @@ -508,6 +511,7 @@ int vfe_enable_output_v2(struct vfe_line *line) struct vfe_output *output = &line->output; const struct vfe_hw_ops *ops = vfe->res->hw_ops; struct media_pad *sensor_pad; + struct media_pad *csid_pad; unsigned long flags; unsigned int frame_skip = 0; unsigned int i; @@ -523,6 +527,9 @@ int vfe_enable_output_v2(struct vfe_line *line) frame_skip = VFE_FRAME_DROP_VAL - 1; } + csid_pad = media_pad_remote_pad_first(&line->pads[MSM_VFE_PAD_SINK]); + line->sof_seq = csid_get_sof_seq(csid_pad); + spin_lock_irqsave(&vfe->output_lock, flags); ops->reg_update_clear(vfe, line->id); diff --git a/drivers/media/platform/qcom/camss/camss-vfe.h b/drivers/media/platform/qcom/camss/camss-vfe.h index ae9dad353a378..0e2dfa58421ad 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe.h +++ b/drivers/media/platform/qcom/camss/camss-vfe.h @@ -94,6 +94,7 @@ struct vfe_line { struct vfe_output output; const struct camss_format_info *formats; unsigned int nformats; + atomic_t *sof_seq; }; struct vfe_device; -- 2.56.0