Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 6162B25D218 for ; Tue, 9 Sep 2025 16:35:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757435702; cv=none; b=Qi7SNM0kjFG+HOi5zkX0bbG3ApEp6teS1Rbpzckp67PPV/ViNr900m/E8tPV2rQiGXVelKN3IbKJd8yn7tZgXectGFFqk1zGGxepv8oIp/CRZNqtD1TtKdfnGu5gc15IyVDgZmXXJd4kC0KIOKZFD2GJAFTaACFpAy8udDUOXRM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757435702; c=relaxed/simple; bh=aOAP9x2AAJNeZF25twY6wqChAscbqWURSyyNGL0aDTE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Tq4zEoTs8VJYk5j9tGTw4rmr2PfTk6pijSPwA3l64HKgRyDg6nHUFTCKFHQxgKP+z/0sl2I2X+4vtRIha9NYwwwNwxzhRRyM5gc4EsmVBtfgrfMAyEJMFKDVeEMISJwkT4u1tlMlRrlDJByHeZviz8xMZk+IE/fnt2Qn9Wq9mpg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=JVFrROBS; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="JVFrROBS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA886C4CEF4; Tue, 9 Sep 2025 16:35:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1757435702; bh=aOAP9x2AAJNeZF25twY6wqChAscbqWURSyyNGL0aDTE=; h=From:To:Cc:Subject:Date:From; b=JVFrROBS03R4MxqqatxFclRbENvxn/D6hIyvaFIp5cM7hY28KnBrCmsnKVSI7ki71 l1/GggfRm5eAxBksRMl/FTzeCa6iLbi8MJv7AXHaJXBfykNaXqdy3EAgFEOL3HdxyQ GhckLFqfj/Lq1sPBE230ROUZRUn6T1yMDPJjlpJrdtah4e43FCeMyobm8O18PyNDuy W5Fe5JxnKrLqWZ4gcvN1HIF15N4SHovsfyp0SkdRDPZRf2qGNzk3gIgUOFSdieXUpn GL48BcFB+EcuJzIWqVh1LQiHVa9KlTqoJ5FjaZWCgZryDsYoT2h7XQBHFICniRCgdx EcHRUfzW4H5mw== From: bod@kernel.org To: bod@kernel.org, linux-media@vger.kernel.org, hans@jjverkuil.nl Cc: bryan.odonoghue@linaro.org Subject: [GIT PULL FOR 6.18] Please pull platform-qcom-iris-encoder-plus-dependent-fixes-for-6.18-v3 Date: Tue, 9 Sep 2025 17:31:42 +0100 Message-ID: <20250909163454.98410-1-bod@kernel.org> X-Mailer: git-send-email 2.51.0 Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Bryan O'Donoghue The following changes since commit 4bd8a6147645480d550242ff816b4c7ba160e5b7: media: vivid: fix disappearing messages (2025-09-09 16:12:56 +0200) are available in the Git repository at: https://gitlab.freedesktop.org/linux-media/users/bodonoghue.git tags/platform-qcom-iris-encoder-plus-dependent-fixes-for-6.18-v3 for you to fetch changes up to d87c3ac4bb1a47bc3facf64b97198583ac393b2b: media: iris: add VPU33 specific encoding buffer calculation (2025-09-09 16:44:41 +0100) ---------------------------------------------------------------- This tag contains: - A number of Fixes: - An set of patches to enable the encoder which depend on the Fixes: in this PR to apply cleanly - A power-sequencing update from Neil which also depends on code in this tag - v2 missed inclusion of "Fix buffer count reporting.." from Dikshita - fixed in v2. - v3 Fixes merge splat caused by last minute inclusion of sm8750 in platform-qcom-iris-generic-fixes-updates-for-6.18-v2 Rebased and made a small number of interventions to keep parity sm8550, sm8650 and new sm8750. ---------------------------------------------------------------- Dikshita Agarwal (26): media: iris: Fix buffer count reporting in internal buffer check media: iris: Report unreleased PERSIST buffers on session close media: iris: Fix memory leak by freeing untracked persist buffer media: iris: Fix port streaming handling media: iris: Allow substate transition to load resources during output streaming media: iris: Always destroy internal buffers on firmware release response media: iris: Update vbuf flags before v4l2_m2m_buf_done media: iris: Simplify session stop logic by relying on vb2 checks media: iris: Allow stop on firmware only if start was issued. media: iris: Send dummy buffer address for all codecs during drain media: iris: Fix missing LAST flag handling during drain media: iris: Fix format check for CAPTURE plane in try_fmt media: iris: Add support for video encoder device media: iris: Initialize and deinitialize encoder instance structure media: iris: Add support for ENUM_FMT, S/G/TRY_FMT encoder media: iris: Add support for ENUM_FRAMESIZES/FRAMEINTERVALS for encoder media: iris: Add support for VIDIOC_QUERYCAP for encoder video device media: iris: Add encoder support for V4L2 event subscription media: iris: Add support for G/S_SELECTION for encoder video device media: iris: Add support for G/S_PARM for encoder video device media: iris: Add platform-specific capabilities for encoder video device media: iris: Add V4L2 streaming support for encoder video device media: iris: Set platform capabilities to firmware for encoder video device media: iris: Allocate and queue internal buffers for encoder video device media: iris: Add support for buffer management ioctls for encoder device media: iris: Add support for drain sequence in encoder video device Neil Armstrong (1): media: iris: add VPU33 specific encoding buffer calculation drivers/media/platform/qcom/iris/Makefile | 5 +- drivers/media/platform/qcom/iris/iris_buffer.c | 222 ++++- drivers/media/platform/qcom/iris/iris_buffer.h | 7 +- drivers/media/platform/qcom/iris/iris_common.c | 232 ++++++ drivers/media/platform/qcom/iris/iris_common.h | 18 + drivers/media/platform/qcom/iris/iris_core.h | 20 +- drivers/media/platform/qcom/iris/iris_ctrls.c | 675 ++++++++++++++- drivers/media/platform/qcom/iris/iris_ctrls.h | 15 + drivers/media/platform/qcom/iris/iris_hfi_common.h | 2 +- .../platform/qcom/iris/iris_hfi_gen1_command.c | 482 ++++++++--- .../platform/qcom/iris/iris_hfi_gen1_defines.h | 112 ++- .../platform/qcom/iris/iris_hfi_gen1_response.c | 60 +- .../platform/qcom/iris/iris_hfi_gen2_command.c | 359 +++++--- .../platform/qcom/iris/iris_hfi_gen2_defines.h | 44 +- .../platform/qcom/iris/iris_hfi_gen2_response.c | 46 +- drivers/media/platform/qcom/iris/iris_instance.h | 24 + .../platform/qcom/iris/iris_platform_common.h | 76 +- .../media/platform/qcom/iris/iris_platform_gen2.c | 561 ++++++++++++- .../platform/qcom/iris/iris_platform_qcs8300.h | 352 +++++++- .../platform/qcom/iris/iris_platform_sm8250.c | 236 +++++- drivers/media/platform/qcom/iris/iris_probe.c | 33 +- drivers/media/platform/qcom/iris/iris_state.c | 9 +- drivers/media/platform/qcom/iris/iris_state.h | 1 + drivers/media/platform/qcom/iris/iris_utils.c | 36 + drivers/media/platform/qcom/iris/iris_utils.h | 2 + drivers/media/platform/qcom/iris/iris_vb2.c | 58 +- drivers/media/platform/qcom/iris/iris_vdec.c | 251 +----- drivers/media/platform/qcom/iris/iris_vdec.h | 13 +- drivers/media/platform/qcom/iris/iris_venc.c | 579 +++++++++++++ drivers/media/platform/qcom/iris/iris_venc.h | 27 + drivers/media/platform/qcom/iris/iris_vidc.c | 299 ++++++- drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 922 ++++++++++++++++++++- drivers/media/platform/qcom/iris/iris_vpu_buffer.h | 24 +- 33 files changed, 5076 insertions(+), 726 deletions(-) create mode 100644 drivers/media/platform/qcom/iris/iris_common.c create mode 100644 drivers/media/platform/qcom/iris/iris_common.h create mode 100644 drivers/media/platform/qcom/iris/iris_venc.c create mode 100644 drivers/media/platform/qcom/iris/iris_venc.h