Re: [PATCH v3 0/6] media: qcom: iris: add support for decoding 10bit formats

[Bryan O'Donoghue <bod@kernel.org>]

Can you rebase off of:

https://gitlab.freedesktop.org/linux-media/media-committers/-/tree/next

and ideally make sure everything applies against

https://gitlab.freedesktop.org/linux-media/users/bodonoghue/-/tree/next+fixes

bod-media-committers-next-plaform-qcom(next-smoketest*)$ b4 shazam 
20260511-topic-sm8x50-iris-10bit-decoding-v3-0-7fc049b93042@linaro.org
Grabbing thread from 
lore.kernel.org/all/20260511-topic-sm8x50-iris-10bit-decoding-v3-0-7fc049b93042@linaro.org/t.mbox.gz
Checking for newer revisions
Grabbing search results from lore.kernel.org
Analyzing 25 messages in the thread
Analyzing 12 code-review messages
Checking attestation on all messages, may take a moment...
---
   ✓ [PATCH v3 1/6] media: qcom: iris: add helpers for 8bit and 10bit 
formats
     + Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
   ✓ [PATCH v3 2/6] media: qcom: iris: add QC10C & P010 buffer size 
calculations
   ✓ [PATCH v3 3/6] media: qcom: iris: gen2: add support for 10bit decoding
     + Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
   ✓ [PATCH v3 4/6] media: qcom: iris: vdec: update size and stride 
calculations for 10bit formats
     + Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
   ✓ [PATCH v3 5/6] media: qcom: iris: vdec: update find_format to 
handle 8bit and 10bit formats
     + Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
   ✓ [PATCH v3 6/6] media: qcom: iris: vdec: allow GEN2 decoding into 
10bit format
     + Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
   ---
   ✓ Signed: openpgp/neil.armstrong@linaro.org
   ---
   NOTE: install dkimpy for DKIM signature verification
---
Total patches: 6
---
  Base: base-commit 76671814f2843482d97feca12e95c06f0b05bc8a not known, 
ignoring
Applying: media: qcom: iris: add helpers for 8bit and 10bit formats
Applying: media: qcom: iris: add QC10C & P010 buffer size calculations
Applying: media: qcom: iris: gen2: add support for 10bit decoding
Applying: media: qcom: iris: vdec: update size and stride calculations 
for 10bit formats
Applying: media: qcom: iris: vdec: update find_format to handle 8bit and 
10bit formats
Applying: media: qcom: iris: vdec: allow GEN2 decoding into 10bit format
Patch failed at 0006 media: qcom: iris: vdec: allow GEN2 decoding into 
10bit format
error: drivers/media/platform/qcom/iris/iris_platform_gen2.c: does not 
exist in index

that file got zapped in:

commit 53a5e095636acbab817a7fb98a67ce76cac59fdf
Author: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Date:   Sun Mar 29 02:33:10 2026 +0200

     media: qcom: iris: split platform data from firmware data

     Finalize the logical separation of the software and hardware interface
     descriptions by moving hardware properties to the files specific to the
     particular VPU version.

     Reviewed-by: Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com>
     Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
     Signed-off-by: Bryan O'Donoghue <bod@kernel.org>

diff --git a/drivers/media/platform/qcom/iris/Makefile 
b/drivers/media/platform/qcom/iris/Makefile
index 2fde45f817276..48e415cbc4390 100644
--- a/drivers/media/platform/qcom/iris/Makefile
+++ b/drivers/media/platform/qcom/iris/Makefile
@@ -4,14 +4,16 @@ qcom-iris-objs += iris_buffer.o \
               iris_ctrls.o \
               iris_firmware.o \
               iris_hfi_common.o \
+             iris_hfi_gen1.o \
               iris_hfi_gen1_command.o \
               iris_hfi_gen1_response.o \
+             iris_hfi_gen2.o \
               iris_hfi_gen2_command.o \
               iris_hfi_gen2_packet.o \
               iris_hfi_gen2_response.o \
               iris_hfi_queue.o \
-             iris_platform_gen1.o \
-             iris_platform_gen2.o \
+             iris_platform_vpu2.o \
+             iris_platform_vpu3x.o \
               iris_power.o \
               iris_probe.o \
               iris_resources.o \

---
bod