[GIT,PULL,FOR,v5.14] Add support for older Rockchip SoCs to V4L2 hantro and rkvdec drivers
Message ID | c103c08f-295b-38d3-4a38-44f5edc1a594@xs4all.nl (mailing list archive) |
---|---|
State | Accepted, archived |
Headers |
Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from <linux-media-owner@vger.kernel.org>) id 1lt9zy-000HP8-PE; Tue, 15 Jun 2021 14:25:03 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231250AbhFOO1F (ORCPT <rfc822;mkrufky@linuxtv.org> + 1 other); Tue, 15 Jun 2021 10:27:05 -0400 Received: from lb2-smtp-cloud8.xs4all.net ([194.109.24.25]:39503 "EHLO lb2-smtp-cloud8.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230076AbhFOOZ2 (ORCPT <rfc822;linux-media@vger.kernel.org>); Tue, 15 Jun 2021 10:25:28 -0400 Received: from cust-b5b5937f ([IPv6:fc0c:c16d:66b8:757f:c639:739b:9d66:799d]) by smtp-cloud8.xs4all.net with ESMTPA id t9yHlmNUFhqltt9yKlrzOG; Tue, 15 Jun 2021 16:23:21 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xs4all.nl; s=s2; t=1623767001; bh=4W9GwisFDBb9nhoEJL6huo/q/MmGyhJDiQFsFqe1Bgo=; h=To:From:Subject:Message-ID:Date:MIME-Version:Content-Type:From: Subject; b=EQn6t8rfItlfrEiEC5j4P7welo3glaTD7WPBreB60PBhqNtKy/hkGVar4uqJIyfrP Yr2kJZZl8302O1vQT+EqQXuWBkFYJJy8YEMNWlyoAUvAbSJP+D99zkdvHrzFwvbGTF YtxuuFku37ucCDvGNYd0TB6S2U+v8QtdZ5TB3xDGW99MFC2+Xw8YrookpNjAEQqlN+ Ip1PN01hbLY0MkHn0LwVvLmCtpEw5BkExku5CJFFNYAjlGfubT7ggN/bx2uwJSXPnl CW9k31QFPrXFgH0WXpIvAfn2fyFNOOxFtgKGGUb6fFxFGEhi/oBP24vpLL6PtxtvVc qnhgVYgxxb67w== To: Linux Media Mailing List <linux-media@vger.kernel.org> Cc: Alex Bee <knaerzche@gmail.com>, Ezequiel Garcia <ezequiel@collabora.com>, Heiko Stuebner <heiko@sntech.de> From: Hans Verkuil <hverkuil@xs4all.nl> Subject: [GIT PULL FOR v5.14] Add support for older Rockchip SoCs to V4L2 hantro and rkvdec drivers Message-ID: <c103c08f-295b-38d3-4a38-44f5edc1a594@xs4all.nl> Date: Tue, 15 Jun 2021 16:23:17 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Firefox/78.0 Thunderbird/78.10.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-CMAE-Envelope: MS4xfAWBiObb3ZjowkYcgOypKFOaUn7mx124J77DDAFP1MlTtDSo/GzyYFaE5/3RNtrB/y7ulFI5vNKhpEiwSqGPenQhfSOzPwk0tMKQeKQ1F3CS30+tYVaP RcWkszLf1v1EMedEEEDObkHgJTxpCWUKIwC8MAf1aeuOr7vT7seKqwyX9JmkWp0iPMjh0RbWnOwyD5js+yIZI1Hzl5KqoJrTtHDD3nP/mlyPSwNP41tSaiI/ X6PQuhl3kqM4Fi1aiYZiiVJdkEEEFx/HtqdKlLGB1+pawVDRXymEQyhAs/sRbM0Q Precedence: bulk List-ID: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -3.2 (---) X-LSpam-Report: No, score=-3.2 required=5.0 tests=BAYES_00=-1.9,DKIMWL_WL_MED=0.001,DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_LOW=-0.7 autolearn=ham autolearn_force=no |
Series |
[GIT,PULL,FOR,v5.14] Add support for older Rockchip SoCs to V4L2 hantro and rkvdec drivers
|
|
Pull-request
git://linuxtv.org/hverkuil/media_tree.git tags/br-v5.14oMessage
Hans Verkuil
June 15, 2021, 2:23 p.m. UTC
The following changes since commit 45040f675041956ad763f9ef139ecee3647aa8bb: media: hantro: IMX8M: add variant for G2/HEVC codec (2021-06-08 16:13:53 +0200) are available in the Git repository at: git://linuxtv.org/hverkuil/media_tree.git tags/br-v5.14o for you to fetch changes up to e47575ad338b8b303884d7d820c1f4b73bf464fc: media: hantro: add support for Rockchip RK3036 (2021-06-15 15:39:35 +0200) ---------------------------------------------------------------- Tag branch ---------------------------------------------------------------- Alex Bee (6): dt-bindings: media: rockchip-vpu: add new compatibles dt-bindings: media: rockchip-vdec: add RK3228 compatible media: hantro: reorder variants media: hantro: merge Rockchip platform drivers media: hantro: add support for Rockchip RK3066 media: hantro: add support for Rockchip RK3036 Documentation/devicetree/bindings/media/rockchip,vdec.yaml | 10 +- Documentation/devicetree/bindings/media/rockchip-vpu.yaml | 33 +- drivers/staging/media/hantro/Makefile | 9 +- drivers/staging/media/hantro/hantro_drv.c | 6 +- drivers/staging/media/hantro/hantro_hw.h | 32 +- drivers/staging/media/hantro/rk3288_vpu_hw.c | 208 ------------- drivers/staging/media/hantro/rk3399_vpu_hw.c | 222 -------------- .../hantro/{rk3399_vpu_hw_jpeg_enc.c => rockchip_vpu2_hw_jpeg_enc.c} | 30 +- .../{rk3399_vpu_hw_mpeg2_dec.c => rockchip_vpu2_hw_mpeg2_dec.c} | 25 +- .../hantro/{rk3399_vpu_hw_vp8_dec.c => rockchip_vpu2_hw_vp8_dec.c} | 2 +- .../staging/media/hantro/{rk3399_vpu_regs.h => rockchip_vpu2_regs.h} | 6 +- drivers/staging/media/hantro/rockchip_vpu_hw.c | 526 ++++++++++++++++++++++++++++++++ 12 files changed, 616 insertions(+), 493 deletions(-) delete mode 100644 drivers/staging/media/hantro/rk3288_vpu_hw.c delete mode 100644 drivers/staging/media/hantro/rk3399_vpu_hw.c rename drivers/staging/media/hantro/{rk3399_vpu_hw_jpeg_enc.c => rockchip_vpu2_hw_jpeg_enc.c} (87%) rename drivers/staging/media/hantro/{rk3399_vpu_hw_mpeg2_dec.c => rockchip_vpu2_hw_mpeg2_dec.c} (94%) rename drivers/staging/media/hantro/{rk3399_vpu_hw_vp8_dec.c => rockchip_vpu2_hw_vp8_dec.c} (99%) rename drivers/staging/media/hantro/{rk3399_vpu_regs.h => rockchip_vpu2_regs.h} (99%) create mode 100644 drivers/staging/media/hantro/rockchip_vpu_hw.c
Comments
From: builder@linuxtv.org
Pull request: https://patchwork.linuxtv.org/project/linux-media/patch/c103c08f-295b-38d3-4a38-44f5edc1a594@xs4all.nl/
Build log: https://builder.linuxtv.org/job/patchwork/115583/
Build time: 00:15:22
Link: https://lore.kernel.org/linux-media/c103c08f-295b-38d3-4a38-44f5edc1a594@xs4all.nl
gpg: Signature made Tue 15 Jun 2021 02:21:19 PM 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
Summary: got 6/6 patches with issues, being 6 at build time, plus one error when buinding PDF document
Error/warnings:
patches/0001-dt-bindings-media-rockchip-vpu-add-new-compatibles.patch:
allyesconfig: return code #0:
../scripts/genksyms/parse.y: warning: 9 shift/reduce conflicts [-Wconflicts-sr]
../scripts/genksyms/parse.y: warning: 5 reduce/reduce conflicts [-Wconflicts-rr]
allyesconfig: return code #512:
SPARSE:../drivers/media/cec/core/cec-core.c ../include/asm-generic/bitops/find.h:90:32: warning: shift count is negative (-192)
SPARSE:../drivers/media/mc/mc-devnode.c ../include/asm-generic/bitops/find.h:90:32: warning: shift count is negative (-192)
SPARSE:../drivers/media/v4l2-core/v4l2-dev.c ../include/asm-generic/bitops/find.h:132:46: warning: shift count is negative (-192)
../drivers/media/v4l2-core/v4l2-ioctl.c: ../drivers/media/v4l2-core/v4l2-ioctl.c:268 v4l_print_fmtdesc() error: unrecognized %p extension '4', treated as normal %p
../drivers/media/v4l2-core/v4l2-ioctl.c: ../drivers/media/v4l2-core/v4l2-ioctl.c:292 v4l_print_format() error: unrecognized %p extension '4', treated as normal %p
../drivers/media/v4l2-core/v4l2-ioctl.c: ../drivers/media/v4l2-core/v4l2-ioctl.c:302 v4l_print_format() error: unrecognized %p extension '4', treated as normal %p
../drivers/media/v4l2-core/v4l2-ioctl.c: ../drivers/media/v4l2-core/v4l2-ioctl.c:328 v4l_print_format() error: unrecognized %p extension '4', treated as normal %p
../drivers/media/v4l2-core/v4l2-ioctl.c: ../drivers/media/v4l2-core/v4l2-ioctl.c:347 v4l_print_format() error: unrecognized %p extension '4', treated as normal %p
../drivers/media/v4l2-core/v4l2-ioctl.c: ../drivers/media/v4l2-core/v4l2-ioctl.c:352 v4l_print_format() error: unrecognized %p extension '4', treated as normal %p
../drivers/media/v4l2-core/v4l2-ioctl.c: ../drivers/media/v4l2-core/v4l2-ioctl.c:362 v4l_print_framebuffer() error: unrecognized %p extension '4', treated as normal %p
../drivers/media/v4l2-core/v4l2-ioctl.c: ../drivers/media/v4l2-core/v4l2-ioctl.c:735 v4l_print_frmsizeenum() error: unrecognized %p extension '4', treated as normal %p
../drivers/media/v4l2-core/v4l2-ioctl.c: ../drivers/media/v4l2-core/v4l2-ioctl.c:762 v4l_print_frmivalenum() error: unrecognized %p extension '4', treated as normal %p
../drivers/media/v4l2-core/v4l2-ioctl.c: ../drivers/media/v4l2-core/v4l2-ioctl.c:1424 v4l_fill_fmtdesc() error: unrecognized %p extension '4', treated as normal %p
../drivers/media/test-drivers/vivid/vivid-core.c: ../drivers/media/test-drivers/vivid/vivid-core.c:1969 vivid_create_instance() parse error: turning off implications after 60 seconds
(null):builtin:2:0: error: missing terminating " character
No such file: drivers/media/platform/atmel/atmel-xisc"
SPARSE:(null) builtin:2:0: warning: missing terminating " character
No such file: drivers/media/platform/atmel/atmel-xisc"
make[5]: *** [../scripts/Makefile.build:272: drivers/media/platform/atmel/atmel-isc-base.o] Error 1
make[5]: *** Deleting file 'drivers/media/platform/atmel/atmel-isc-base.o'
make[5]: *** Waiting for unfinished jobs....
make[4]: *** [../scripts/Makefile.build:515: drivers/media/platform/atmel] Error 2
make[4]: *** Waiting for unfinished jobs....
make[3]: *** [../scripts/Makefile.build:515: drivers/media/platform] Error 2
make[3]: *** Waiting for unfinished jobs....
../drivers/media/usb/em28xx/em28xx-video.c: ../drivers/media/usb/em28xx/em28xx-video.c:2841 em28xx_v4l2_init() parse error: turning off implications after 60 seconds
make[2]: *** [../scripts/Makefile.build:515: drivers/media] Error 2
make[1]: *** [/var/lib/jenkins/workspace/patchwork/Makefile:1844: drivers] Error 2
make: *** [Makefile:215: __sub-make] Error 2
patches/0002-dt-bindings-media-rockchip-vdec-add-RK3228-compatibl.patch:
allyesconfig: return code #512:
(null):builtin:2:0: error: missing terminating " character
No such file: drivers/media/platform/atmel/atmel-xisc"
SPARSE:(null) builtin:2:0: warning: missing terminating " character
No such file: drivers/media/platform/atmel/atmel-xisc"
make[5]: *** [../scripts/Makefile.build:272: drivers/media/platform/atmel/atmel-isc-base.o] Error 1
make[5]: *** Deleting file 'drivers/media/platform/atmel/atmel-isc-base.o'
make[4]: *** [../scripts/Makefile.build:515: drivers/media/platform/atmel] Error 2
make[4]: *** Waiting for unfinished jobs....
make[3]: *** [../scripts/Makefile.build:515: drivers/media/platform] Error 2
make[2]: *** [../scripts/Makefile.build:515: drivers/media] Error 2
make[1]: *** [/var/lib/jenkins/workspace/patchwork/Makefile:1844: drivers] Error 2
make: *** [Makefile:215: __sub-make] Error 2
patches/0003-media-hantro-reorder-variants.patch:
allyesconfig: return code #512:
(null):builtin:2:0: error: missing terminating " character
No such file: drivers/media/platform/atmel/atmel-xisc"
SPARSE:(null) builtin:2:0: warning: missing terminating " character
No such file: drivers/media/platform/atmel/atmel-xisc"
make[5]: *** [../scripts/Makefile.build:272: drivers/media/platform/atmel/atmel-isc-base.o] Error 1
make[5]: *** Deleting file 'drivers/media/platform/atmel/atmel-isc-base.o'
make[4]: *** [../scripts/Makefile.build:515: drivers/media/platform/atmel] Error 2
make[3]: *** [../scripts/Makefile.build:515: drivers/media/platform] Error 2
make[3]: *** Waiting for unfinished jobs....
make[2]: *** [../scripts/Makefile.build:515: drivers/media] Error 2
make[1]: *** [/var/lib/jenkins/workspace/patchwork/Makefile:1844: drivers] Error 2
make: *** [Makefile:215: __sub-make] Error 2
patches/0004-media-hantro-merge-Rockchip-platform-drivers.patch:
allyesconfig: return code #512:
(null):builtin:2:0: error: missing terminating " character
No such file: drivers/media/platform/atmel/atmel-xisc"
SPARSE:(null) builtin:2:0: warning: missing terminating " character
No such file: drivers/media/platform/atmel/atmel-xisc"
make[5]: *** [../scripts/Makefile.build:272: drivers/media/platform/atmel/atmel-isc-base.o] Error 1
make[5]: *** Deleting file 'drivers/media/platform/atmel/atmel-isc-base.o'
make[4]: *** [../scripts/Makefile.build:515: drivers/media/platform/atmel] Error 2
make[4]: *** Waiting for unfinished jobs....
make[3]: *** [../scripts/Makefile.build:515: drivers/media/platform] Error 2
make[2]: *** [../scripts/Makefile.build:515: drivers/media] Error 2
make[1]: *** [/var/lib/jenkins/workspace/patchwork/Makefile:1844: drivers] Error 2
make: *** [Makefile:215: __sub-make] Error 2
checkpatch.pl:
$ cat patches/0004-media-hantro-merge-Rockchip-platform-drivers.patch | formail -c | ./scripts/checkpatch.pl --terse --mailback --no-summary --strict
-:15: WARNING: Possible unwrapped commit description (prefer a maximum 75 chars per line)
-:34: WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
patches/0005-media-hantro-add-support-for-Rockchip-RK3066.patch:
allyesconfig: return code #512:
(null):builtin:2:0: error: missing terminating " character
No such file: drivers/media/platform/atmel/atmel-xisc"
SPARSE:(null) builtin:2:0: warning: missing terminating " character
No such file: drivers/media/platform/atmel/atmel-xisc"
make[5]: *** [../scripts/Makefile.build:272: drivers/media/platform/atmel/atmel-isc-base.o] Error 1
make[5]: *** Deleting file 'drivers/media/platform/atmel/atmel-isc-base.o'
make[4]: *** [../scripts/Makefile.build:515: drivers/media/platform/atmel] Error 2
make[4]: *** Waiting for unfinished jobs....
make[3]: *** [../scripts/Makefile.build:515: drivers/media/platform] Error 2
make[3]: *** Waiting for unfinished jobs....
make[2]: *** [../scripts/Makefile.build:515: drivers/media] Error 2
make[1]: *** [/var/lib/jenkins/workspace/patchwork/Makefile:1844: drivers] Error 2
make: *** [Makefile:215: __sub-make] Error 2
patches/0006-media-hantro-add-support-for-Rockchip-RK3036.patch:
allyesconfig: return code #512:
(null):builtin:2:0: error: missing terminating " character
No such file: drivers/media/platform/atmel/atmel-xisc"
SPARSE:(null) builtin:2:0: warning: missing terminating " character
No such file: drivers/media/platform/atmel/atmel-xisc"
make[5]: *** [../scripts/Makefile.build:272: drivers/media/platform/atmel/atmel-isc-base.o] Error 1
make[5]: *** Deleting file 'drivers/media/platform/atmel/atmel-isc-base.o'
make[4]: *** [../scripts/Makefile.build:515: drivers/media/platform/atmel] Error 2
make[4]: *** Waiting for unfinished jobs....
make[3]: *** [../scripts/Makefile.build:515: drivers/media/platform] Error 2
make[3]: *** Waiting for unfinished jobs....
make[2]: *** [../scripts/Makefile.build:515: drivers/media] Error 2
make[1]: *** [/var/lib/jenkins/workspace/patchwork/Makefile:1844: drivers] Error 2
make: *** [Makefile:215: __sub-make] Error 2
Error #512 when building PDF docs
From: builder@linuxtv.org
Pull request: https://patchwork.linuxtv.org/project/linux-media/patch/c103c08f-295b-38d3-4a38-44f5edc1a594@xs4all.nl/
Build log: https://builder.linuxtv.org/job/patchwork/115851/
Build time: 00:14:21
Link: https://lore.kernel.org/linux-media/c103c08f-295b-38d3-4a38-44f5edc1a594@xs4all.nl
gpg: Signature made Tue 15 Jun 2021 02:21:19 PM 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
Summary: got 2/6 patches with issues, being 1 at build time
Error/warnings:
patches/0001-dt-bindings-media-rockchip-vpu-add-new-compatibles.patch:
allyesconfig: return code #0:
../scripts/genksyms/parse.y: warning: 9 shift/reduce conflicts [-Wconflicts-sr]
../scripts/genksyms/parse.y: warning: 5 reduce/reduce conflicts [-Wconflicts-rr]
allyesconfig: return code #0:
SPARSE:../drivers/media/cec/core/cec-core.c ../include/asm-generic/bitops/find.h:90:32: warning: shift count is negative (-192)
SPARSE:../drivers/media/mc/mc-devnode.c ../include/asm-generic/bitops/find.h:90:32: warning: shift count is negative (-192)
SPARSE:../drivers/media/v4l2-core/v4l2-dev.c ../include/asm-generic/bitops/find.h:132:46: warning: shift count is negative (-192)
../drivers/media/v4l2-core/v4l2-ioctl.c: ../drivers/media/v4l2-core/v4l2-ioctl.c:268 v4l_print_fmtdesc() error: unrecognized %p extension '4', treated as normal %p
../drivers/media/v4l2-core/v4l2-ioctl.c: ../drivers/media/v4l2-core/v4l2-ioctl.c:292 v4l_print_format() error: unrecognized %p extension '4', treated as normal %p
../drivers/media/v4l2-core/v4l2-ioctl.c: ../drivers/media/v4l2-core/v4l2-ioctl.c:302 v4l_print_format() error: unrecognized %p extension '4', treated as normal %p
../drivers/media/v4l2-core/v4l2-ioctl.c: ../drivers/media/v4l2-core/v4l2-ioctl.c:328 v4l_print_format() error: unrecognized %p extension '4', treated as normal %p
../drivers/media/v4l2-core/v4l2-ioctl.c: ../drivers/media/v4l2-core/v4l2-ioctl.c:347 v4l_print_format() error: unrecognized %p extension '4', treated as normal %p
../drivers/media/v4l2-core/v4l2-ioctl.c: ../drivers/media/v4l2-core/v4l2-ioctl.c:352 v4l_print_format() error: unrecognized %p extension '4', treated as normal %p
../drivers/media/v4l2-core/v4l2-ioctl.c: ../drivers/media/v4l2-core/v4l2-ioctl.c:362 v4l_print_framebuffer() error: unrecognized %p extension '4', treated as normal %p
../drivers/media/v4l2-core/v4l2-ioctl.c: ../drivers/media/v4l2-core/v4l2-ioctl.c:735 v4l_print_frmsizeenum() error: unrecognized %p extension '4', treated as normal %p
../drivers/media/v4l2-core/v4l2-ioctl.c: ../drivers/media/v4l2-core/v4l2-ioctl.c:762 v4l_print_frmivalenum() error: unrecognized %p extension '4', treated as normal %p
../drivers/media/v4l2-core/v4l2-ioctl.c: ../drivers/media/v4l2-core/v4l2-ioctl.c:1424 v4l_fill_fmtdesc() error: unrecognized %p extension '4', treated as normal %p
../drivers/media/test-drivers/vivid/vivid-core.c: ../drivers/media/test-drivers/vivid/vivid-core.c:1969 vivid_create_instance() parse error: turning off implications after 60 seconds
../drivers/media/usb/em28xx/em28xx-video.c: ../drivers/media/usb/em28xx/em28xx-video.c:2841 em28xx_v4l2_init() parse error: turning off implications after 60 seconds
patches/0004-media-hantro-merge-Rockchip-platform-drivers.patch:
checkpatch.pl:
$ cat patches/0004-media-hantro-merge-Rockchip-platform-drivers.patch | formail -c | ./scripts/checkpatch.pl --terse --mailback --no-summary --strict
-:15: WARNING: Possible unwrapped commit description (prefer a maximum 75 chars per line)
-:34: WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?