| Message ID | 57e15ed1-61c7-0240-5bf3-115de3bbec9c@xs4all.nl (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [GIT,PULL,FOR,v5.14] vb2_queue_change_type, hevc fix and atmel-isc series | expand |
From: builder@linuxtv.org
Pull request: https://patchwork.linuxtv.org/project/linux-media/patch/57e15ed1-61c7-0240-5bf3-115de3bbec9c@xs4all.nl/
Build log: https://builder.linuxtv.org/job/patchwork/112158/
Build time: 00:00:00
Link: https://lore.kernel.org/linux-media/57e15ed1-61c7-0240-5bf3-115de3bbec9c@xs4all.nl
gpg: Signature made Thu 03 Jun 2021 10:47:23 AM UTC
gpg: using RSA key AAA7FFBA4D2D77EF4CAEA1421326E0CD23ABDCE5
gpg: Good signature from "Hans Verkuil <hverkuil-cisco@xs4all.nl>" [unknown]
gpg: aka "Hans Verkuil <hverkuil@xs4all.nl>" [full]
gpg: Note: This key has expired!
Primary key fingerprint: 052C DE7B C215 053B 689F 1BCA BD2D 6148 6614 3B4C
Subkey fingerprint: AAA7 FFBA 4D2D 77EF 4CAE A142 1326 E0CD 23AB DCE5
Build aborted due to a fatal error:
FAILED: patch patch patches/0028-media-atmel-atmel-isc-move-the-formats-list-into-pro.patch doesn't apply:
Applying patch patches/0028-media-atmel-atmel-isc-move-the-formats-list-into-pro.patch
patching file drivers/media/platform/atmel/atmel-isc-base.c
Hunk #2 FAILED at 788.
Hunk #3 succeeded at 1346 (offset -1 lines).
Hunk #4 succeeded at 1383 (offset -1 lines).
Hunk #5 succeeded at 1995 (offset -1 lines).
Hunk #6 succeeded at 2018 (offset -1 lines).
Hunk #7 succeeded at 2028 (offset -1 lines).
Hunk #8 succeeded at 2049 (offset -1 lines).
1 out of 8 hunks FAILED -- rejects in file drivers/media/platform/atmel/atmel-isc-base.c
patching file drivers/media/platform/atmel/atmel-isc.h
patching file drivers/media/platform/atmel/atmel-sama5d2-isc.c
Patch patches/0028-media-atmel-atmel-isc-move-the-formats-list-into-pro.patch does not apply (enforce with -f)
From: builder@linuxtv.org
Pull request: https://patchwork.linuxtv.org/project/linux-media/patch/57e15ed1-61c7-0240-5bf3-115de3bbec9c@xs4all.nl/
Build log: https://builder.linuxtv.org/job/patchwork/112375/
Build time: 00:00:00
Link: https://lore.kernel.org/linux-media/57e15ed1-61c7-0240-5bf3-115de3bbec9c@xs4all.nl
gpg: Signature made Thu 03 Jun 2021 10:47:23 AM UTC
gpg: using RSA key AAA7FFBA4D2D77EF4CAEA1421326E0CD23ABDCE5
gpg: Good signature from "Hans Verkuil <hverkuil-cisco@xs4all.nl>" [unknown]
gpg: aka "Hans Verkuil <hverkuil@xs4all.nl>" [full]
gpg: Note: This key has expired!
Primary key fingerprint: 052C DE7B C215 053B 689F 1BCA BD2D 6148 6614 3B4C
Subkey fingerprint: AAA7 FFBA 4D2D 77EF 4CAE A142 1326 E0CD 23AB DCE5
Build aborted due to a fatal error:
FAILED: patch patch patches/0028-media-atmel-atmel-isc-move-the-formats-list-into-pro.patch doesn't apply:
Applying patch patches/0028-media-atmel-atmel-isc-move-the-formats-list-into-pro.patch
patching file drivers/media/platform/atmel/atmel-isc-base.c
Hunk #2 FAILED at 788.
Hunk #3 succeeded at 1346 (offset -1 lines).
Hunk #4 succeeded at 1383 (offset -1 lines).
Hunk #5 succeeded at 1995 (offset -1 lines).
Hunk #6 succeeded at 2018 (offset -1 lines).
Hunk #7 succeeded at 2028 (offset -1 lines).
Hunk #8 succeeded at 2049 (offset -1 lines).
1 out of 8 hunks FAILED -- rejects in file drivers/media/platform/atmel/atmel-isc-base.c
patching file drivers/media/platform/atmel/atmel-isc.h
patching file drivers/media/platform/atmel/atmel-sama5d2-isc.c
Patch patches/0028-media-atmel-atmel-isc-move-the-formats-list-into-pro.patch does not apply (enforce with -f)
The following changes since commit 80c1c54a2aa3c5177f73fc5d505668df56fb28b6: Merge tag 'v5.13-rc4' into media_tree (2021-06-02 10:59:50 +0200) are available in the Git repository at: git://linuxtv.org/hverkuil/media_tree.git tags/br-v5.14h for you to fetch changes up to c975bf843c20b4875f91e9eaf863c5431824bfa5: MAINTAINERS: add xisc files to isc driver entry (2021-06-03 12:45:27 +0200) ---------------------------------------------------------------- Tag branch ---------------------------------------------------------------- Eugen Hristev (33): media: atmel: atmel-isc: specialize gamma table into product specific media: atmel: atmel-isc: specialize driver name constant media: atmel: atmel-isc: add checks for limiting frame sizes media: atmel: atmel-isc: specialize max width and max height media: atmel: atmel-isc: specialize dma cfg media: atmel: atmel-isc: extract CSC submodule config into separate function media: atmel: atmel-isc-base: add id to clock debug message media: atmel: atmel-isc: create register offsets struct media: atmel: atmel-isc: extract CBC submodule config into separate function media: atmel: atmel-isc: add CBC to the reg offsets struct media: atmel: atmel-isc: add SUB422 and SUB420 to register offsets media: atmel: atmel-isc: add RLP to register offsets media: atmel: atmel-isc: add HIS to register offsets media: atmel: atmel-isc: add DMA to register offsets media: atmel: atmel-isc: add support for version register media: atmel: atmel-isc: add his_entry to register offsets media: atmel: atmel-isc: add register description for additional modules media: atmel: atmel-isc: extend pipeline with extra modules media: atmel: atmel-isc: add CC initialization function media: atmel: atmel-isc: create product specific v4l2 controls config media: atmel: atmel-isc: create callback for DPC submodule product specific media: atmel: atmel-isc: create callback for GAM submodule product specific media: atmel: atmel-isc: create callback for RLP submodule product specific media: atmel: atmel-isc: move the formats list into product specific code media: atmel: atmel-isc: create an adapt pipeline callback for product specific media: atmel: atmel-isc-regs: add additional fields for sama7g5 type pipeline media: atmel: atmel-isc-base: add support for more formats and additional pipeline modules media: atmel: atmel-isc-sama5d2: remove duplicate define dt-bindings: media: atmel-isc: convert to yaml dt-bindings: media: add microchip,xisc device bindings media: atmel: atmel-isc: add microchip-xisc driver MAINTAINERS: update ISC driver bindings file MAINTAINERS: add xisc files to isc driver entry John Cox (1): media: hevc: Add sps_max_sub_layers_minus1 to v4l2_ctrl_hevc_sps Tomi Valkeinen (3): media: videobuf2-v4l2.c: add vb2_queue_change_type() helper media: vivid: remove stream_sliced_vbi_cap field media: vivid: use vb2_queue_change_type Documentation/devicetree/bindings/media/atmel,isc.yaml | 114 ++++++++ Documentation/devicetree/bindings/media/atmel-isc.txt | 65 ----- Documentation/devicetree/bindings/media/microchip,xisc.yaml | 129 ++++++++ Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst | 3 + MAINTAINERS | 4 +- drivers/media/common/videobuf2/videobuf2-v4l2.c | 14 + drivers/media/platform/Makefile | 1 + drivers/media/platform/atmel/Kconfig | 11 + drivers/media/platform/atmel/Makefile | 2 + drivers/media/platform/atmel/atmel-isc-base.c | 381 +++++++++--------------- drivers/media/platform/atmel/atmel-isc-regs.h | 133 ++++++++- drivers/media/platform/atmel/atmel-isc.h | 122 ++++++-- drivers/media/platform/atmel/atmel-sama5d2-isc.c | 300 ++++++++++++++++++- drivers/media/platform/atmel/atmel-sama7g5-isc.c | 630 ++++++++++++++++++++++++++++++++++++++++ drivers/media/test-drivers/vivid/vivid-core.c | 44 ++- drivers/media/test-drivers/vivid/vivid-core.h | 1 - drivers/media/test-drivers/vivid/vivid-kthread-cap.c | 2 +- drivers/media/test-drivers/vivid/vivid-vbi-cap.c | 8 +- include/media/hevc-ctrls.h | 3 +- include/media/videobuf2-v4l2.h | 16 + 20 files changed, 1628 insertions(+), 355 deletions(-) create mode 100644 Documentation/devicetree/bindings/media/atmel,isc.yaml delete mode 100644 Documentation/devicetree/bindings/media/atmel-isc.txt create mode 100644 Documentation/devicetree/bindings/media/microchip,xisc.yaml create mode 100644 drivers/media/platform/atmel/atmel-sama7g5-isc.c