jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-03 16:07:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5499 from heitbaum/kernel10rc

Browse Source 
[Allwinner,Generic,Rockchip] linux: Update to 5.10.61
This commit is contained in:
CvH 2021-08-28 07:59:31 +02:00 committed by GitHub
commit 536a90c9da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 1235 additions and 1075 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/linux/package.mk
View File

@ -28,8 +28,8 @@ case "${LINUX}" in
PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
;; ;;
*) *)
PKG_VERSION="5.10.47" PKG_VERSION="5.10.61"
PKG_SHA256="30b52a2fe6d1e0c1e1dc651d5df9a37eb54b35ea1f7f51b9f23d8903c29ae1c5" PKG_SHA256="82eae38cc5cd11dd6aaac91c02ff0d006c7bafd6d4cf5c6a791930820a3a91d1"
PKG_URL="https://www.kernel.org/pub/linux/kernel/v5.x/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_URL="https://www.kernel.org/pub/linux/kernel/v5.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
PKG_PATCH_DIRS="default" PKG_PATCH_DIRS="default"
;; ;;

155
packages/multimedia/ffmpeg/patches/v4l2-request/ffmpeg-001-v4l2-request.patch
View File

@ -1,7 +1,7 @@
From 785728e72dbd513b58d97af2590fafba0f8a24bb Mon Sep 17 00:00:00 2001 From 5e6ad66e892d02b7ab2e20727c9532d0a903c82a Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se> From: Jonas Karlman <jonas@kwiboo.se>
Date: Mon, 3 Dec 2018 23:48:04 +0100 Date: Mon, 3 Dec 2018 23:48:04 +0100
Subject: [PATCH 01/22] avutil: add av_buffer_pool_flush() Subject: [PATCH 01/23] avutil: add av_buffer_pool_flush()
Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
--- ---
@ -50,10 +50,10 @@ index c0f3f6cc9abe..998beec9ac5b 100644
* Mark the pool as being available for freeing. It will actually be freed only * Mark the pool as being available for freeing. It will actually be freed only
* once all the allocated buffers associated with the pool are released. Thus it * once all the allocated buffers associated with the pool are released. Thus it
From abd5308771a71ba582155a1665a1c40878232040 Mon Sep 17 00:00:00 2001 From 2d9818d9ee4d61cd0a386cc0b49259a7da4e86be Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se> From: Jonas Karlman <jonas@kwiboo.se>
Date: Sat, 15 Dec 2018 22:32:16 +0100 Date: Sat, 15 Dec 2018 22:32:16 +0100
Subject: [PATCH 02/22] Add common V4L2 request API code Subject: [PATCH 02/23] Add common V4L2 request API code
Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
--- ---
@ -67,7 +67,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
create mode 100644 libavcodec/v4l2_request.h create mode 100644 libavcodec/v4l2_request.h
diff --git a/configure b/configure diff --git a/configure b/configure
index 8569a60bf827..9f9909a23696 100755 index 36713ab658f9..81ee0e740498 100755
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -274,6 +274,7 @@ External library support: @@ -274,6 +274,7 @@ External library support:
@ -1237,10 +1237,10 @@ index 000000000000..58d2aa70af80
+ +
+#endif /* AVCODEC_V4L2_REQUEST_H */ +#endif /* AVCODEC_V4L2_REQUEST_H */
From e1ae7e32ce4798f3032a04ccb20a1f76834c3bea Mon Sep 17 00:00:00 2001 From 41342491beb7377f1a0dbd6cd1bd061375974b82 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se> From: Jonas Karlman <jonas@kwiboo.se>
Date: Sat, 15 Dec 2018 22:32:16 +0100 Date: Sat, 15 Dec 2018 22:32:16 +0100
Subject: [PATCH 03/22] Add V4L2 request API mpeg2 hwaccel Subject: [PATCH 03/23] Add V4L2 request API mpeg2 hwaccel
Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
--- ---
@ -1253,7 +1253,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
create mode 100644 libavcodec/v4l2_request_mpeg2.c create mode 100644 libavcodec/v4l2_request_mpeg2.c
diff --git a/configure b/configure diff --git a/configure b/configure
index 9f9909a23696..6b157d6d3ef0 100755 index 81ee0e740498..436ab72378cd 100755
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -2967,6 +2967,8 @@ mpeg2_dxva2_hwaccel_deps="dxva2" @@ -2967,6 +2967,8 @@ mpeg2_dxva2_hwaccel_deps="dxva2"
@ -1482,10 +1482,10 @@ index 000000000000..88d86cc4c23f
+ .caps_internal = HWACCEL_CAP_ASYNC_SAFE, + .caps_internal = HWACCEL_CAP_ASYNC_SAFE,
+}; +};
From 8a728ea300aee2fab7a181cab06c2c3cfdd0b705 Mon Sep 17 00:00:00 2001 From fe49e657618c7bf5e5d8f0d085545168f9883ea0 Mon Sep 17 00:00:00 2001
From: Jernej Skrabec <jernej.skrabec@siol.net> From: Jernej Skrabec <jernej.skrabec@siol.net>
Date: Sat, 15 Dec 2018 22:32:16 +0100 Date: Sat, 15 Dec 2018 22:32:16 +0100
Subject: [PATCH 04/22] Add V4L2 request API h264 hwaccel Subject: [PATCH 04/23] Add V4L2 request API h264 hwaccel
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
@ -1500,7 +1500,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
create mode 100644 libavcodec/v4l2_request_h264.c create mode 100644 libavcodec/v4l2_request_h264.c
diff --git a/configure b/configure diff --git a/configure b/configure
index 6b157d6d3ef0..1a7720ebe3be 100755 index 436ab72378cd..6ed48234dd25 100755
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -2925,6 +2925,8 @@ h264_dxva2_hwaccel_deps="dxva2" @@ -2925,6 +2925,8 @@ h264_dxva2_hwaccel_deps="dxva2"
@ -1533,7 +1533,7 @@ index 8963bd3e91cf..9a10a292e377 100644
OBJS-$(CONFIG_H264_VDPAU_HWACCEL) += vdpau_h264.o OBJS-$(CONFIG_H264_VDPAU_HWACCEL) += vdpau_h264.o
OBJS-$(CONFIG_H264_VIDEOTOOLBOX_HWACCEL) += videotoolbox.o OBJS-$(CONFIG_H264_VIDEOTOOLBOX_HWACCEL) += videotoolbox.o
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index db8363e4cc98..3ae11ac8a711 100644 index 111e1dfe7fa1..984abda7b218 100644
--- a/libavcodec/h264_slice.c --- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c
@@ -759,6 +759,7 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback) @@ -759,6 +759,7 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback)
@ -2047,10 +2047,10 @@ index 000000000000..94b9aca8ad45
+ .caps_internal = HWACCEL_CAP_ASYNC_SAFE, + .caps_internal = HWACCEL_CAP_ASYNC_SAFE,
+}; +};
From 72758190a3d062b64db756c60761187a2b9ce1c9 Mon Sep 17 00:00:00 2001 From 64bd31ac6e7cdbad566a5af3838089fdc949ff7a Mon Sep 17 00:00:00 2001
From: Jernej Skrabec <jernej.skrabec@siol.net> From: Jernej Skrabec <jernej.skrabec@siol.net>
Date: Sat, 15 Dec 2018 22:32:16 +0100 Date: Sat, 15 Dec 2018 22:32:16 +0100
Subject: [PATCH 05/22] Add V4L2 request API hevc hwaccel Subject: [PATCH 05/23] Add V4L2 request API hevc hwaccel
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
@ -2064,7 +2064,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
create mode 100644 libavcodec/v4l2_request_hevc.c create mode 100644 libavcodec/v4l2_request_hevc.c
diff --git a/configure b/configure diff --git a/configure b/configure
index 1a7720ebe3be..58abd99335b5 100755 index 6ed48234dd25..402a8566eb63 100755
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -2941,6 +2941,8 @@ hevc_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_HEVC" @@ -2941,6 +2941,8 @@ hevc_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_HEVC"
@ -2097,7 +2097,7 @@ index 9a10a292e377..5d0e1d7dae77 100644
OBJS-$(CONFIG_HEVC_VDPAU_HWACCEL) += vdpau_hevc.o OBJS-$(CONFIG_HEVC_VDPAU_HWACCEL) += vdpau_hevc.o
OBJS-$(CONFIG_MJPEG_NVDEC_HWACCEL) += nvdec_mjpeg.o OBJS-$(CONFIG_MJPEG_NVDEC_HWACCEL) += nvdec_mjpeg.o
diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c
index 0772608a30e0..d01b7b34bcee 100644 index 1eaeaf72f145..7e47bd7177e1 100644
--- a/libavcodec/hevcdec.c --- a/libavcodec/hevcdec.c
+++ b/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c
@@ -372,6 +372,7 @@ static enum AVPixelFormat get_format(HEVCContext *s, const HEVCSPS *sps) @@ -372,6 +372,7 @@ static enum AVPixelFormat get_format(HEVCContext *s, const HEVCSPS *sps)
@ -2128,7 +2128,7 @@ index 0772608a30e0..d01b7b34bcee 100644
#endif #endif
break; break;
case AV_PIX_FMT_YUV444P: case AV_PIX_FMT_YUV444P:
@@ -3588,6 +3595,9 @@ AVCodec ff_hevc_decoder = { @@ -3593,6 +3600,9 @@ AVCodec ff_hevc_decoder = {
#endif #endif
#if CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL #if CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL
HWACCEL_VIDEOTOOLBOX(hevc), HWACCEL_VIDEOTOOLBOX(hevc),
@ -2690,10 +2690,10 @@ index 000000000000..f72490954653
+ .caps_internal = HWACCEL_CAP_ASYNC_SAFE, + .caps_internal = HWACCEL_CAP_ASYNC_SAFE,
+}; +};
From ebc06b180bfc3c4c6e02cfe2f559e140ce0020e8 Mon Sep 17 00:00:00 2001 From 44b0e55923c95d997b5422961cc79ad89e7c8c7e Mon Sep 17 00:00:00 2001
From: Boris Brezillon <boris.brezillon@collabora.com> From: Boris Brezillon <boris.brezillon@collabora.com>
Date: Wed, 22 May 2019 14:46:58 +0200 Date: Wed, 22 May 2019 14:46:58 +0200
Subject: [PATCH 06/22] Add V4L2 request API vp8 hwaccel Subject: [PATCH 06/23] Add V4L2 request API vp8 hwaccel
Need to fix the STREAMOFF/STREAMON issue in a proper way. Need to fix the STREAMOFF/STREAMON issue in a proper way.
@ -2709,7 +2709,7 @@ Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
create mode 100644 libavcodec/v4l2_request_vp8.c create mode 100644 libavcodec/v4l2_request_vp8.c
diff --git a/configure b/configure diff --git a/configure b/configure
index 58abd99335b5..cbb91c2bca43 100755 index 402a8566eb63..94476afd5df1 100755
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -3003,6 +3003,8 @@ vc1_vdpau_hwaccel_deps="vdpau" @@ -3003,6 +3003,8 @@ vc1_vdpau_hwaccel_deps="vdpau"
@ -2940,7 +2940,7 @@ index 000000000000..7e75ee398a2e
+ .caps_internal = HWACCEL_CAP_ASYNC_SAFE, + .caps_internal = HWACCEL_CAP_ASYNC_SAFE,
+}; +};
diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c
index bab4223aca11..0e1edb46fb20 100644 index e84fcdeaa1e7..0608d9e4e165 100644
--- a/libavcodec/vp8.c --- a/libavcodec/vp8.c
+++ b/libavcodec/vp8.c +++ b/libavcodec/vp8.c
@@ -175,6 +175,9 @@ static enum AVPixelFormat get_pixel_format(VP8Context *s) @@ -175,6 +175,9 @@ static enum AVPixelFormat get_pixel_format(VP8Context *s)
@ -2973,10 +2973,10 @@ index bab4223aca11..0e1edb46fb20 100644
NULL NULL
}, },
From cf21ba63945bf6a0a60616ceb0a000e42d02f044 Mon Sep 17 00:00:00 2001 From 86a834fa296531a08e6c29d57cc55b4fe7e7aeb3 Mon Sep 17 00:00:00 2001
From: Ezequiel Garcia <ezequiel@collabora.com> From: Ezequiel Garcia <ezequiel@collabora.com>
Date: Wed, 20 Feb 2019 11:18:00 -0300 Date: Wed, 20 Feb 2019 11:18:00 -0300
Subject: [PATCH 07/22] avcodec/h264: parse idr_pic_id Subject: [PATCH 07/23] avcodec/h264: parse idr_pic_id
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com> Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
--- ---
@ -2986,7 +2986,7 @@ Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
3 files changed, 4 insertions(+), 2 deletions(-) 3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 3ae11ac8a711..96e8edd10289 100644 index 984abda7b218..1870a57df952 100644
--- a/libavcodec/h264_slice.c --- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c
@@ -1822,7 +1822,7 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl, @@ -1822,7 +1822,7 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl,
@ -3025,10 +3025,10 @@ index 94b9aca8ad45..9382e573b40b 100644
.delta_pic_order_cnt_bottom = sl->delta_poc_bottom, .delta_pic_order_cnt_bottom = sl->delta_poc_bottom,
.delta_pic_order_cnt0 = sl->delta_poc[0], .delta_pic_order_cnt0 = sl->delta_poc[0],
From 13d2f3430db4d83ce30c921bf2b3ee44e1d6ec55 Mon Sep 17 00:00:00 2001 From 0e6ea840dedfa7b7894ded46a554cd95361e36bc Mon Sep 17 00:00:00 2001
From: Boris Brezillon <boris.brezillon@collabora.com> From: Boris Brezillon <boris.brezillon@collabora.com>
Date: Wed, 22 May 2019 14:44:22 +0200 Date: Wed, 22 May 2019 14:44:22 +0200
Subject: [PATCH 08/22] avcodec/h264: parse ref_pic_marking_size_in_bits and Subject: [PATCH 08/23] avcodec/h264: parse ref_pic_marking_size_in_bits and
pic_order_cnt_bit_size pic_order_cnt_bit_size
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
@ -3039,7 +3039,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
3 files changed, 9 insertions(+), 3 deletions(-) 3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 96e8edd10289..c3896cfd90ab 100644 index 1870a57df952..355e3e14347b 100644
--- a/libavcodec/h264_slice.c --- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c
@@ -1740,7 +1740,7 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl, @@ -1740,7 +1740,7 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl,
@ -3114,10 +3114,10 @@ index 9382e573b40b..bdaeb67d2618 100644
.cabac_init_idc = sl->cabac_init_idc, .cabac_init_idc = sl->cabac_init_idc,
.slice_qp_delta = sl->qscale - pps->init_qp, .slice_qp_delta = sl->qscale - pps->init_qp,
From 5ba945f011277dee7b4fb36af60810fd9b401f79 Mon Sep 17 00:00:00 2001 From d264deca75a549d7839076b081761d97bc0d9357 Mon Sep 17 00:00:00 2001
From: Jernej Skrabec <jernej.skrabec@siol.net> From: Jernej Skrabec <jernej.skrabec@siol.net>
Date: Thu, 14 Feb 2019 23:20:05 +0100 Date: Thu, 14 Feb 2019 23:20:05 +0100
Subject: [PATCH 09/22] Add and use private linux headers for V4L2 request API Subject: [PATCH 09/23] Add and use private linux headers for V4L2 request API
ctrls ctrls
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
@ -3138,7 +3138,7 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
create mode 100644 libavcodec/vp8-ctrls.h create mode 100644 libavcodec/vp8-ctrls.h
diff --git a/configure b/configure diff --git a/configure b/configure
index cbb91c2bca43..623012757c60 100755 index 94476afd5df1..a2072b09b8f7 100755
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -2925,7 +2925,7 @@ h264_dxva2_hwaccel_deps="dxva2" @@ -2925,7 +2925,7 @@ h264_dxva2_hwaccel_deps="dxva2"
@ -3857,10 +3857,10 @@ index 000000000000..53cba826e482
+ +
+#endif +#endif
From 77c91a97c87424c1d6bff888bc8562a9b6697aa2 Mon Sep 17 00:00:00 2001 From 40dd525080aadb6c513d5780e82a92d7e4db9af0 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se> From: Jonas Karlman <jonas@kwiboo.se>
Date: Sat, 2 May 2020 11:00:26 +0000 Date: Sat, 2 May 2020 11:00:26 +0000
Subject: [PATCH 10/22] Update to v5.7 private linux headers Subject: [PATCH 10/23] Update to v5.7 private linux headers
--- ---
libavcodec/h264-ctrls.h | 2 ++ libavcodec/h264-ctrls.h | 2 ++
@ -3901,10 +3901,10 @@ index 0254716e5239..d28ed07da3b4 100644
entry->flags |= V4L2_H264_DPB_ENTRY_FLAG_LONG_TERM; entry->flags |= V4L2_H264_DPB_ENTRY_FLAG_LONG_TERM;
if (pic->field_poc[0] != INT_MAX) if (pic->field_poc[0] != INT_MAX)
From 40407184ac1cd48d35acc6b0d8bdec48a98c74fb Mon Sep 17 00:00:00 2001 From 515026026b46e28c1230d773c76a5b9cf7952c08 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se> From: Jonas Karlman <jonas@kwiboo.se>
Date: Sat, 2 May 2020 22:03:42 +0000 Date: Sat, 2 May 2020 22:03:42 +0000
Subject: [PATCH 11/22] Update to v5.8 private linux headers Subject: [PATCH 11/23] Update to v5.8 private linux headers
--- ---
libavcodec/h264-ctrls.h | 8 +++++++- libavcodec/h264-ctrls.h | 8 +++++++-
@ -3937,10 +3937,10 @@ index 1c6ff7d63bca..080fd1293c42 100644
__u16 nal_ref_idc; __u16 nal_ref_idc;
__s32 top_field_order_cnt; __s32 top_field_order_cnt;
From 6a151e35d99c430030709b49a6abd36349a65887 Mon Sep 17 00:00:00 2001 From 5cb8582d315bb2d504233169a82781d3161fefd3 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se> From: Jonas Karlman <jonas@kwiboo.se>
Date: Sun, 6 Sep 2020 16:07:13 +0000 Date: Sun, 6 Sep 2020 16:07:13 +0000
Subject: [PATCH 12/22] Update to v5.10 private linux headers Subject: [PATCH 12/23] Update to v5.10 private linux headers
--- ---
libavcodec/h264-ctrls.h | 89 +++++++++------- libavcodec/h264-ctrls.h | 89 +++++++++-------
@ -4490,10 +4490,10 @@ index d28ed07da3b4..c9dbaf8c3e34 100644
ret = ff_v4l2_request_init(avctx, V4L2_PIX_FMT_H264_SLICE, 4 * 1024 * 1024, control, FF_ARRAY_ELEMS(control)); ret = ff_v4l2_request_init(avctx, V4L2_PIX_FMT_H264_SLICE, 4 * 1024 * 1024, control, FF_ARRAY_ELEMS(control));
if (ret) if (ret)
From f9f4a89058a6fac25712cc385eab72f70e9ac4c8 Mon Sep 17 00:00:00 2001 From 9867ec02f9e072031384247086e7aa17c59b1484 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se> From: Jonas Karlman <jonas@kwiboo.se>
Date: Mon, 29 Apr 2019 22:08:59 +0000 Date: Mon, 29 Apr 2019 22:08:59 +0000
Subject: [PATCH 13/22] HACK: hwcontext_drm: do not require drm device Subject: [PATCH 13/23] HACK: hwcontext_drm: do not require drm device
Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
--- ---
@ -4517,10 +4517,10 @@ index 32cbde82ebfa..aa4794c5e665 100644
if (hwctx->fd < 0) if (hwctx->fd < 0)
return AVERROR(errno); return AVERROR(errno);
From 027f8c90ec25c42899b24d96b434e6ed1a1a8c40 Mon Sep 17 00:00:00 2001 From 2e0e4fc392ce23b0793640dda2257f4fdd154f2c Mon Sep 17 00:00:00 2001
From: Jernej Skrabec <jernej.skrabec@siol.net> From: Jernej Skrabec <jernej.skrabec@siol.net>
Date: Sat, 15 Dec 2018 22:32:16 +0100 Date: Sat, 15 Dec 2018 22:32:16 +0100
Subject: [PATCH 14/22] WIP: hevc scaling matrix Subject: [PATCH 14/23] WIP: hevc scaling matrix
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
--- ---
@ -4610,10 +4610,10 @@ index c16f8a868e38..f400bf4f3c82 100644
.id = V4L2_CID_MPEG_VIDEO_HEVC_SLICE_PARAMS, .id = V4L2_CID_MPEG_VIDEO_HEVC_SLICE_PARAMS,
.ptr = &controls->slice_params, .ptr = &controls->slice_params,
From 9c4a66cca0df6fd0976f907f1e315a715e5ffd87 Mon Sep 17 00:00:00 2001 From 401a94e82f7228e3ad1aa3fc5b46cd485f5e6bb4 Mon Sep 17 00:00:00 2001
From: Jernej Skrabec <jernej.skrabec@siol.net> From: Jernej Skrabec <jernej.skrabec@siol.net>
Date: Sat, 15 Dec 2018 22:32:16 +0100 Date: Sat, 15 Dec 2018 22:32:16 +0100
Subject: [PATCH 15/22] WIP: hevc segment address Subject: [PATCH 15/23] WIP: hevc segment address
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
--- ---
@ -4659,10 +4659,10 @@ index f400bf4f3c82..98222fc74c36 100644
.nal_unit_type = h->nal_unit_type, .nal_unit_type = h->nal_unit_type,
.nuh_temporal_id_plus1 = h->temporal_id + 1, .nuh_temporal_id_plus1 = h->temporal_id + 1,
From 62795e555cfcccfc29c144f0ed5acae5336479c7 Mon Sep 17 00:00:00 2001 From c37e5239ba5744ab195ebf40f5c07547a843e349 Mon Sep 17 00:00:00 2001
From: Jernej Skrabec <jernej.skrabec@siol.net> From: Jernej Skrabec <jernej.skrabec@siol.net>
Date: Sat, 15 Dec 2018 22:32:16 +0100 Date: Sat, 15 Dec 2018 22:32:16 +0100
Subject: [PATCH 16/22] WIP: hevc entry point offsets Subject: [PATCH 16/23] WIP: hevc entry point offsets
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
--- ---
@ -4714,10 +4714,10 @@ index 98222fc74c36..7e77c83e4e4b 100644
static void fill_sps(struct v4l2_ctrl_hevc_sps *ctrl, const HEVCContext *h) static void fill_sps(struct v4l2_ctrl_hevc_sps *ctrl, const HEVCContext *h)
From edaaede001e7fbae26a0a668ea1db2b642896322 Mon Sep 17 00:00:00 2001 From 4231aa409318a4fd904852cdfca4ec7ac4864152 Mon Sep 17 00:00:00 2001
From: Boris Brezillon <boris.brezillon@collabora.com> From: Boris Brezillon <boris.brezillon@collabora.com>
Date: Thu, 12 Dec 2019 16:13:55 +0100 Date: Thu, 12 Dec 2019 16:13:55 +0100
Subject: [PATCH 17/22] WIP: Add V4L2 request API vp9 hwaccel Subject: [PATCH 17/23] WIP: Add V4L2 request API vp9 hwaccel
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
--- ---
@ -4731,7 +4731,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
create mode 100644 libavcodec/v4l2_request_vp9.c create mode 100644 libavcodec/v4l2_request_vp9.c
diff --git a/configure b/configure diff --git a/configure b/configure
index 623012757c60..2b723df55aed 100755 index a2072b09b8f7..27cb8f1cabfe 100755
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -3015,6 +3015,8 @@ vp9_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_VP9" @@ -3015,6 +3015,8 @@ vp9_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_VP9"
@ -5198,10 +5198,10 @@ index 54726df742f9..fee3568736f7 100644
uint8_t pred_prob[3]; uint8_t pred_prob[3];
struct { struct {
From ef82ae9fffba44e88d59a3fa4b958a38d1b5cd9e Mon Sep 17 00:00:00 2001 From bedadeb845d7a2ba3ffed3ca646aa114e3826ec1 Mon Sep 17 00:00:00 2001
From: Boris Brezillon <boris.brezillon@collabora.com> From: Boris Brezillon <boris.brezillon@collabora.com>
Date: Thu, 12 Dec 2019 16:13:55 +0100 Date: Thu, 12 Dec 2019 16:13:55 +0100
Subject: [PATCH 18/22] WIP: Add and use vp9 private linux header Subject: [PATCH 18/23] WIP: Add and use vp9 private linux header
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
--- ---
@ -5212,7 +5212,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
create mode 100644 libavcodec/vp9-ctrls.h create mode 100644 libavcodec/vp9-ctrls.h
diff --git a/configure b/configure diff --git a/configure b/configure
index 2b723df55aed..87c6836af275 100755 index 27cb8f1cabfe..48154dc56c71 100755
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -3015,7 +3015,7 @@ vp9_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_VP9" @@ -3015,7 +3015,7 @@ vp9_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_VP9"
@ -5728,10 +5728,10 @@ index 000000000000..0cdea8a18b72
+ +
+#endif /* _VP9_CTRLS_H_ */ +#endif /* _VP9_CTRLS_H_ */
From 4b268a93e5945dc7863a8dc953a12fa157b4f8e6 Mon Sep 17 00:00:00 2001 From d0df3f1ca04b103ad3ec4dfa87f044ef02d7bc6c Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se> From: Jonas Karlman <jonas@kwiboo.se>
Date: Fri, 15 May 2020 16:54:05 +0000 Date: Fri, 15 May 2020 16:54:05 +0000
Subject: [PATCH 19/22] WIP: add NV15 and NV20 support Subject: [PATCH 19/23] WIP: add NV15 and NV20 support
Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
--- ---
@ -5740,7 +5740,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
2 files changed, 35 insertions(+), 2 deletions(-) 2 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index c3896cfd90ab..39ae8fabfd3b 100644 index 355e3e14347b..8d79d254e0a7 100644
--- a/libavcodec/h264_slice.c --- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c
@@ -785,10 +785,17 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback) @@ -785,10 +785,17 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback)
@ -5815,10 +5815,10 @@ index 5234b5049b0d..0b294feff2eb 100644
default: default:
return -1; return -1;
From fa7165e391287bf970569e36b0b19bff947b084f Mon Sep 17 00:00:00 2001 From 593fff35db5ffaeaf4bcea8e341bfd46f25dcb7e Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se> From: Jonas Karlman <jonas@kwiboo.se>
Date: Mon, 27 Jul 2020 23:15:45 +0000 Date: Mon, 27 Jul 2020 23:15:45 +0000
Subject: [PATCH 20/22] HACK: define drm NV15 and NV20 format Subject: [PATCH 20/23] HACK: define drm NV15 and NV20 format
--- ---
libavcodec/v4l2_request.c | 8 ++++++++ libavcodec/v4l2_request.c | 8 ++++++++
@ -5844,10 +5844,10 @@ index 0b294feff2eb..a8f0ee79eeef 100644
{ {
V4L2RequestDescriptor *req = (V4L2RequestDescriptor*)frame->data[0]; V4L2RequestDescriptor *req = (V4L2RequestDescriptor*)frame->data[0];
From 4ee9ede28d912637e64a7472acd3e8ab5272f41b Mon Sep 17 00:00:00 2001 From 1b6604052fe9e86a124719e765892cf9262fe29b Mon Sep 17 00:00:00 2001
From: Jernej Skrabec <jernej.skrabec@siol.net> From: Jernej Skrabec <jernej.skrabec@siol.net>
Date: Sun, 11 Apr 2021 08:40:57 +0000 Date: Sun, 11 Apr 2021 08:40:57 +0000
Subject: [PATCH 21/22] WIP: hevc: slice dependent flag Subject: [PATCH 21/23] WIP: hevc: slice dependent flag
--- ---
libavcodec/hevc-ctrls.h | 1 + libavcodec/hevc-ctrls.h | 1 +
@ -5881,10 +5881,10 @@ index 7e77c83e4e4b..116a69340af3 100644
const HEVCFrame *frame = &h->DPB[i]; const HEVCFrame *frame = &h->DPB[i];
if (frame != pic && (frame->flags & (HEVC_FRAME_FLAG_LONG_REF | HEVC_FRAME_FLAG_SHORT_REF))) { if (frame != pic && (frame->flags & (HEVC_FRAME_FLAG_LONG_REF | HEVC_FRAME_FLAG_SHORT_REF))) {
From a327aa791645517b031ac8d89a720b1907cfb96a Mon Sep 17 00:00:00 2001 From d1b337d8733208685d527612c3dbefff4960fe3a Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se> From: Jonas Karlman <jonas@kwiboo.se>
Date: Wed, 13 May 2020 22:51:21 +0000 Date: Wed, 13 May 2020 22:51:21 +0000
Subject: [PATCH 22/22] WIP: hevc rkvdec fields Subject: [PATCH 22/23] WIP: hevc rkvdec fields
Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
--- ---
@ -6004,3 +6004,40 @@ index 116a69340af3..eb493b309fe9 100644
return ff_v4l2_request_decode_frame(avctx, h->ref->frame, control, FF_ARRAY_ELEMS(control)); return ff_v4l2_request_decode_frame(avctx, h->ref->frame, control, FF_ARRAY_ELEMS(control));
} }
From dec361c86ab63081e9d1eb0ea4a143ec500c0cf9 Mon Sep 17 00:00:00 2001
From: Jernej Skrabec <jernej.skrabec@gmail.com>
Date: Sun, 25 Jul 2021 08:40:58 +0200
Subject: [PATCH 23/23] WIP: hevc: Align naming with mainline
---
libavcodec/hevc-ctrls.h | 2 +-
libavcodec/v4l2_request_hevc.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/hevc-ctrls.h b/libavcodec/hevc-ctrls.h
index c54687bfe658..10a4296ac219 100644
--- a/libavcodec/hevc-ctrls.h
+++ b/libavcodec/hevc-ctrls.h
@@ -86,7 +86,7 @@ struct v4l2_ctrl_hevc_sps {
__u64 flags;
};
-#define V4L2_HEVC_PPS_FLAG_DEPENDENT_SLICE_SEGMENT (1ULL << 0)
+#define V4L2_HEVC_PPS_FLAG_DEPENDENT_SLICE_SEGMENT_ENABLED (1ULL << 0)
#define V4L2_HEVC_PPS_FLAG_OUTPUT_FLAG_PRESENT (1ULL << 1)
#define V4L2_HEVC_PPS_FLAG_SIGN_DATA_HIDING_ENABLED (1ULL << 2)
#define V4L2_HEVC_PPS_FLAG_CABAC_INIT_PRESENT (1ULL << 3)
diff --git a/libavcodec/v4l2_request_hevc.c b/libavcodec/v4l2_request_hevc.c
index eb493b309fe9..c5ecd12ec235 100644
--- a/libavcodec/v4l2_request_hevc.c
+++ b/libavcodec/v4l2_request_hevc.c
@@ -350,7 +350,7 @@ static int v4l2_request_hevc_start_frame(AVCodecContext *avctx,
};
if (pps->dependent_slice_segments_enabled_flag)
- controls->pps.flags |= V4L2_HEVC_PPS_FLAG_DEPENDENT_SLICE_SEGMENT;
+ controls->pps.flags |= V4L2_HEVC_PPS_FLAG_DEPENDENT_SLICE_SEGMENT_ENABLED;
if (pps->output_flag_present_flag)
controls->pps.flags |= V4L2_HEVC_PPS_FLAG_OUTPUT_FLAG_PRESENT;

3
projects/Allwinner/linux/linux.aarch64.conf
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/arm64 5.10.44 Kernel Configuration # Linux/arm64 5.10.52 Kernel Configuration
# #
CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc.real (GNU Toolchain for the A-profile Architecture 10.2-2020.11 (arm-10.16)) 10.2.1 20201103" CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc.real (GNU Toolchain for the A-profile Architecture 10.2-2020.11 (arm-10.16)) 10.2.1 20201103"
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y
@ -2714,6 +2714,7 @@ CONFIG_AXP20X_POWER=y
# CONFIG_CHARGER_BQ25980 is not set # CONFIG_CHARGER_BQ25980 is not set
# CONFIG_CHARGER_SMB347 is not set # CONFIG_CHARGER_SMB347 is not set
# CONFIG_BATTERY_GAUGE_LTC2941 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set
# CONFIG_BATTERY_RT5033 is not set
# CONFIG_CHARGER_RT9455 is not set # CONFIG_CHARGER_RT9455 is not set
# CONFIG_CHARGER_UCS1002 is not set # CONFIG_CHARGER_UCS1002 is not set
# CONFIG_CHARGER_BD99954 is not set # CONFIG_CHARGER_BD99954 is not set

6
projects/Allwinner/linux/linux.arm.conf
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/arm 5.10.17 Kernel Configuration # Linux/arm 5.10.53 Kernel Configuration
# #
CONFIG_CC_VERSION_TEXT="armv7ve-libreelec-linux-gnueabihf-gcc-10.2.0 (GCC) 10.2.0" CONFIG_CC_VERSION_TEXT="armv7ve-libreelec-linux-gnueabihf-gcc-10.2.0 (GCC) 10.2.0"
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y
@ -581,6 +581,7 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y
# #
# Firmware Drivers # Firmware Drivers
# #
# CONFIG_ARM_SCMI_PROTOCOL is not set
# CONFIG_FIRMWARE_MEMMAP is not set # CONFIG_FIRMWARE_MEMMAP is not set
# CONFIG_FW_CFG_SYSFS is not set # CONFIG_FW_CFG_SYSFS is not set
# CONFIG_TRUSTED_FOUNDATIONS is not set # CONFIG_TRUSTED_FOUNDATIONS is not set
@ -1405,6 +1406,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
# NVME Support # NVME Support
# #
# CONFIG_NVME_FC is not set # CONFIG_NVME_FC is not set
# CONFIG_NVME_TCP is not set
# CONFIG_NVME_TARGET is not set # CONFIG_NVME_TARGET is not set
# end of NVME Support # end of NVME Support
@ -2447,6 +2449,7 @@ CONFIG_AXP20X_POWER=y
# CONFIG_CHARGER_BQ25980 is not set # CONFIG_CHARGER_BQ25980 is not set
# CONFIG_CHARGER_SMB347 is not set # CONFIG_CHARGER_SMB347 is not set
# CONFIG_BATTERY_GAUGE_LTC2941 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set
# CONFIG_BATTERY_RT5033 is not set
# CONFIG_CHARGER_RT9455 is not set # CONFIG_CHARGER_RT9455 is not set
# CONFIG_CHARGER_UCS1002 is not set # CONFIG_CHARGER_UCS1002 is not set
# CONFIG_CHARGER_BD99954 is not set # CONFIG_CHARGER_BD99954 is not set
@ -4590,6 +4593,7 @@ CONFIG_DMABUF_HEAPS_CMA=y
# CONFIG_AUXDISPLAY is not set # CONFIG_AUXDISPLAY is not set
# CONFIG_UIO is not set # CONFIG_UIO is not set
# CONFIG_VFIO is not set
# CONFIG_VIRT_DRIVERS is not set # CONFIG_VIRT_DRIVERS is not set
# CONFIG_VIRTIO_MENU is not set # CONFIG_VIRTIO_MENU is not set
# CONFIG_VDPA is not set # CONFIG_VDPA is not set

2
projects/Allwinner/patches/linux/0026-media-cedrus-hevc-Add-support-for-multiple-slices.patch
View File

@ -68,7 +68,7 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
/* Initialize bitstream access. */ /* Initialize bitstream access. */
cedrus_write(dev, VE_DEC_H265_TRIGGER, VE_DEC_H265_TRIGGER_INIT_SWDEC); cedrus_write(dev, VE_DEC_H265_TRIGGER, VE_DEC_H265_TRIGGER_INIT_SWDEC);
@@ -543,8 +549,8 @@ static void cedrus_h265_setup(struct ced @@ -543,8 +549,8 @@ static void cedrus_h265_setup(struct ced
V4L2_HEVC_PPS_FLAG_DEPENDENT_SLICE_SEGMENT, V4L2_HEVC_SLICE_PARAMS_FLAG_DEPENDENT_SLICE_SEGMENT,
pps->flags); pps->flags);
- /* FIXME: For multi-slice support. */ - /* FIXME: For multi-slice support. */

37
projects/Allwinner/patches/linux/0058-media-cedrus-wip-hevc-dependent-flag.patch
View File

@ -1,37 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jernej Skrabec <jernej.skrabec@siol.net>
Date: Sun, 11 Apr 2021 10:45:50 +0200
Subject: [PATCH] media: cedrus: wip: hevc: dependent flag
---
drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 4 ++--
include/media/hevc-ctrls.h | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_h265.c b/drivers/staging/media/sunxi/cedrus/cedrus_h265.c
index 8861e1535886..ab6fc857a477 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus_h265.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_h265.c
@@ -634,8 +634,8 @@ static void cedrus_h265_setup(struct cedrus_ctx *ctx,
slice_params->flags);
reg |= VE_DEC_H265_FLAG(VE_DEC_H265_DEC_SLICE_HDR_INFO0_FLAG_DEPENDENT_SLICE_SEGMENT,
- V4L2_HEVC_PPS_FLAG_DEPENDENT_SLICE_SEGMENT,
- pps->flags);
+ V4L2_HEVC_SLICE_PARAMS_FLAG_DEPENDENT_SLICE_SEGMENT,
+ slice_params->flags);
if (ctx->fh.m2m_ctx->new_frame)
reg |= VE_DEC_H265_DEC_SLICE_HDR_INFO0_FLAG_FIRST_SLICE_SEGMENT_IN_PIC;
diff --git a/include/media/hevc-ctrls.h b/include/media/hevc-ctrls.h
index eb83c1d61b8d..cd51fb6df1f0 100644
--- a/include/media/hevc-ctrls.h
+++ b/include/media/hevc-ctrls.h
@@ -162,6 +162,7 @@ struct v4l2_hevc_pred_weight_table {
#define V4L2_HEVC_SLICE_PARAMS_FLAG_USE_INTEGER_MV (1ULL << 6)
#define V4L2_HEVC_SLICE_PARAMS_FLAG_SLICE_DEBLOCKING_FILTER_DISABLED (1ULL << 7)
#define V4L2_HEVC_SLICE_PARAMS_FLAG_SLICE_LOOP_FILTER_ACROSS_SLICES_ENABLED (1ULL << 8)
+#define V4L2_HEVC_SLICE_PARAMS_FLAG_DEPENDENT_SLICE_SEGMENT (1ULL << 9)
struct v4l2_ctrl_hevc_slice_params {
__u32 bit_size;

41
projects/Allwinner/patches/linux/0061-ARM-dts-sun8i-h3-orangepi-plus-Fix-ethernet-phy-mode.patch
View File

@ -1,41 +0,0 @@
From b19d3479f25e8a0ff24df0b46c82e50ef0f900dd Mon Sep 17 00:00:00 2001
From: Salvatore Bonaccorso <carnil@debian.org>
Date: Mon, 24 May 2021 14:21:11 +0200
Subject: [PATCH] ARM: dts: sun8i: h3: orangepi-plus: Fix ethernet phy-mode
Commit bbc4d71d6354 ("net: phy: realtek: fix rtl8211e rx/tx delay
config") sets the RX/TX delay according to the phy-mode property in the
device tree. For the Orange Pi Plus board this is "rgmii", which is the
wrong setting.
Following the example of a900cac3750b ("ARM: dts: sun7i: a20: bananapro:
Fix ethernet phy-mode") the phy-mode is changed to "rgmii-id" which gets
the Ethernet working again on this board.
Fixes: bbc4d71d6354 ("net: phy: realtek: fix rtl8211e rx/tx delay config")
Reported-by: "B.R. Oake" <broake@mailfence.com>
Reported-by: Vagrant Cascadian <vagrant@reproducible-builds.org>
Link: https://bugs.debian.org/988574
Signed-off-by: Salvatore Bonaccorso <carnil@debian.org>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/20210524122111.416885-1-carnil@debian.org
---
arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts
index 97f497854e05..d05fa679dcd3 100644
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts
@@ -85,7 +85,7 @@ &emac {
pinctrl-0 = <&emac_rgmii_pins>;
phy-supply = <&reg_gmac_3v3>;
phy-handle = <&ext_rgmii_phy>;
- phy-mode = "rgmii";
+ phy-mode = "rgmii-id";
status = "okay";
};
--
2.31.1

4
projects/Generic/linux/linux.x86_64.conf
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86 5.10.20 Kernel Configuration # Linux/x86 5.10.54 Kernel Configuration
# #
CONFIG_CC_VERSION_TEXT="x86_64-libreelec-linux-gnu-gcc-10.2.0 (GCC) 10.2.0" CONFIG_CC_VERSION_TEXT="x86_64-libreelec-linux-gnu-gcc-10.2.0 (GCC) 10.2.0"
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y
@ -511,6 +511,7 @@ CONFIG_ACPI_PROCESSOR_AGGREGATOR=y
CONFIG_ACPI_THERMAL=y CONFIG_ACPI_THERMAL=y
CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
CONFIG_ACPI_TABLE_UPGRADE=y CONFIG_ACPI_TABLE_UPGRADE=y
# CONFIG_ACPI_TABLE_OVERRIDE_VIA_BUILTIN_INITRD is not set
# CONFIG_ACPI_DEBUG is not set # CONFIG_ACPI_DEBUG is not set
# CONFIG_ACPI_PCI_SLOT is not set # CONFIG_ACPI_PCI_SLOT is not set
CONFIG_ACPI_CONTAINER=y CONFIG_ACPI_CONTAINER=y
@ -2991,6 +2992,7 @@ CONFIG_POWER_SUPPLY_HWMON=y
# CONFIG_CHARGER_BQ25980 is not set # CONFIG_CHARGER_BQ25980 is not set
# CONFIG_CHARGER_SMB347 is not set # CONFIG_CHARGER_SMB347 is not set
# CONFIG_BATTERY_GAUGE_LTC2941 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set
# CONFIG_BATTERY_RT5033 is not set
# CONFIG_CHARGER_RT9455 is not set # CONFIG_CHARGER_RT9455 is not set
# CONFIG_CHARGER_BD99954 is not set # CONFIG_CHARGER_BD99954 is not set
CONFIG_HWMON=y CONFIG_HWMON=y

4
projects/NXP/devices/iMX6/linux/linux.arm.conf
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/arm 5.10.47 Kernel Configuration # Linux/arm 5.10.53 Kernel Configuration
# #
CONFIG_CC_VERSION_TEXT="armv7a-libreelec-linux-gnueabihf-gcc-10.2.0 (GCC) 10.2.0" CONFIG_CC_VERSION_TEXT="armv7a-libreelec-linux-gnueabihf-gcc-10.2.0 (GCC) 10.2.0"
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y
@ -616,6 +616,7 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y
# #
# Firmware Drivers # Firmware Drivers
# #
# CONFIG_ARM_SCMI_PROTOCOL is not set
# CONFIG_FIRMWARE_MEMMAP is not set # CONFIG_FIRMWARE_MEMMAP is not set
# CONFIG_FW_CFG_SYSFS is not set # CONFIG_FW_CFG_SYSFS is not set
# CONFIG_TRUSTED_FOUNDATIONS is not set # CONFIG_TRUSTED_FOUNDATIONS is not set
@ -2707,6 +2708,7 @@ CONFIG_POWER_SUPPLY_HWMON=y
# CONFIG_CHARGER_BQ25980 is not set # CONFIG_CHARGER_BQ25980 is not set
# CONFIG_CHARGER_SMB347 is not set # CONFIG_CHARGER_SMB347 is not set
# CONFIG_BATTERY_GAUGE_LTC2941 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set
# CONFIG_BATTERY_RT5033 is not set
# CONFIG_CHARGER_RT9455 is not set # CONFIG_CHARGER_RT9455 is not set
CONFIG_CHARGER_UCS1002=y CONFIG_CHARGER_UCS1002=y
# CONFIG_CHARGER_BD99954 is not set # CONFIG_CHARGER_BD99954 is not set

5
projects/NXP/devices/iMX8/linux/linux.aarch64.conf
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/arm64 5.10.44 Kernel Configuration # Linux/arm64 5.10.53 Kernel Configuration
# #
CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc.real (GNU Toolchain for the A-profile Architecture 10.2-2020.11 (arm-10.16)) 10.2.1 20201103" CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc.real (GNU Toolchain for the A-profile Architecture 10.2-2020.11 (arm-10.16)) 10.2.1 20201103"
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y
@ -2552,6 +2552,7 @@ CONFIG_POWER_SUPPLY_HWMON=y
# CONFIG_CHARGER_BQ25980 is not set # CONFIG_CHARGER_BQ25980 is not set
# CONFIG_CHARGER_SMB347 is not set # CONFIG_CHARGER_SMB347 is not set
# CONFIG_BATTERY_GAUGE_LTC2941 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set
# CONFIG_BATTERY_RT5033 is not set
# CONFIG_CHARGER_RT9455 is not set # CONFIG_CHARGER_RT9455 is not set
# CONFIG_CHARGER_CROS_USBPD is not set # CONFIG_CHARGER_CROS_USBPD is not set
# CONFIG_CHARGER_UCS1002 is not set # CONFIG_CHARGER_UCS1002 is not set
@ -5593,7 +5594,7 @@ CONFIG_XFS_SUPPORT_V4=y
# CONFIG_GFS2_FS is not set # CONFIG_GFS2_FS is not set
# CONFIG_OCFS2_FS is not set # CONFIG_OCFS2_FS is not set
CONFIG_BTRFS_FS=m CONFIG_BTRFS_FS=m
# CONFIG_BTRFS_FS_POSIX_ACL is not set CONFIG_BTRFS_FS_POSIX_ACL=y
# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
# CONFIG_BTRFS_DEBUG is not set # CONFIG_BTRFS_DEBUG is not set

45
projects/NXP/devices/iMX8/patches/linux/0001-drm-bridge-mhdp-Add-cdns-mhdp-driver-bridge-driver.patch
View File

@ -3695,9 +3695,9 @@ index a4a45daf93f2..058bc372f02b 100644
if (ret) { if (ret) {
- DRM_DEV_ERROR(dp->dev, "Could not write to GRF: %d\n", ret); - DRM_DEV_ERROR(dp->dev, "Could not write to GRF: %d\n", ret);
+ DRM_DEV_ERROR(dev, "Could not write to GRF: %d\n", ret); + DRM_DEV_ERROR(dev, "Could not write to GRF: %d\n", ret);
clk_disable_unprepare(dp->grf_clk);
return ret; return ret;
} }
@@ -83,24 +83,25 @@ static int cdn_dp_grf_write(struct cdn_dp_device *dp, @@ -83,24 +83,25 @@ static int cdn_dp_grf_write(struct cdn_dp_device *dp,
static int cdn_dp_clk_enable(struct cdn_dp_device *dp) static int cdn_dp_clk_enable(struct cdn_dp_device *dp)
@ -5156,7 +5156,7 @@ index 9d2163ef4d6e..000000000000
- */ - */
- do { - do {
- tu_size_reg += 2; - tu_size_reg += 2;
- symbol = tu_size_reg * mode->clock * bit_per_pix; - symbol = (u64)tu_size_reg * mode->clock * bit_per_pix;
- do_div(symbol, dp->max_lanes * link_rate * 8); - do_div(symbol, dp->max_lanes * link_rate * 8);
- rem = do_div(symbol, 1000); - rem = do_div(symbol, 1000);
- if (tu_size_reg > 64) { - if (tu_size_reg > 64) {
@ -5648,26 +5648,6 @@ index 441248b7a79e..d76716d4edc6 100644
}; };
-void cdn_dp_clock_reset(struct cdn_dp_device *dp); -void cdn_dp_clock_reset(struct cdn_dp_device *dp);
-
-void cdn_dp_set_fw_clk(struct cdn_dp_device *dp, unsigned long clk);
-int cdn_dp_load_firmware(struct cdn_dp_device *dp, const u32 *i_mem,
- u32 i_size, const u32 *d_mem, u32 d_size);
-int cdn_dp_set_firmware_active(struct cdn_dp_device *dp, bool enable);
-int cdn_dp_set_host_cap(struct cdn_dp_device *dp, u8 lanes, bool flip);
-int cdn_dp_event_config(struct cdn_dp_device *dp);
-u32 cdn_dp_get_event(struct cdn_dp_device *dp);
-int cdn_dp_get_hpd_status(struct cdn_dp_device *dp);
-int cdn_dp_dpcd_write(struct cdn_dp_device *dp, u32 addr, u8 value);
-int cdn_dp_dpcd_read(struct cdn_dp_device *dp, u32 addr, u8 *data, u16 len);
-int cdn_dp_get_edid_block(void *dp, u8 *edid,
- unsigned int block, size_t length);
-int cdn_dp_train_link(struct cdn_dp_device *dp);
-int cdn_dp_set_video_status(struct cdn_dp_device *dp, int active);
-int cdn_dp_config_video(struct cdn_dp_device *dp);
-int cdn_dp_audio_stop(struct cdn_dp_device *dp, struct audio_info *audio);
-int cdn_dp_audio_mute(struct cdn_dp_device *dp, bool enable);
-int cdn_dp_audio_config(struct cdn_dp_device *dp, struct audio_info *audio);
-#endif /* _CDN_DP_REG_H */
+enum audio_format { +enum audio_format {
+ AFMT_I2S = 0, + AFMT_I2S = 0,
+ AFMT_SPDIF_INT = 1, + AFMT_SPDIF_INT = 1,
@ -5924,7 +5904,26 @@ index 441248b7a79e..d76716d4edc6 100644
+int cdns_mhdp_register_cec_driver(struct device *dev); +int cdns_mhdp_register_cec_driver(struct device *dev);
+int cdns_mhdp_unregister_cec_driver(struct device *dev); +int cdns_mhdp_unregister_cec_driver(struct device *dev);
+#endif +#endif
+
-void cdn_dp_set_fw_clk(struct cdn_dp_device *dp, unsigned long clk);
-int cdn_dp_load_firmware(struct cdn_dp_device *dp, const u32 *i_mem,
- u32 i_size, const u32 *d_mem, u32 d_size);
-int cdn_dp_set_firmware_active(struct cdn_dp_device *dp, bool enable);
-int cdn_dp_set_host_cap(struct cdn_dp_device *dp, u8 lanes, bool flip);
-int cdn_dp_event_config(struct cdn_dp_device *dp);
-u32 cdn_dp_get_event(struct cdn_dp_device *dp);
-int cdn_dp_get_hpd_status(struct cdn_dp_device *dp);
-int cdn_dp_dpcd_write(struct cdn_dp_device *dp, u32 addr, u8 value);
-int cdn_dp_dpcd_read(struct cdn_dp_device *dp, u32 addr, u8 *data, u16 len);
-int cdn_dp_get_edid_block(void *dp, u8 *edid,
- unsigned int block, size_t length);
-int cdn_dp_train_link(struct cdn_dp_device *dp);
-int cdn_dp_set_video_status(struct cdn_dp_device *dp, int active);
-int cdn_dp_config_video(struct cdn_dp_device *dp);
-int cdn_dp_audio_stop(struct cdn_dp_device *dp, struct audio_info *audio);
-int cdn_dp_audio_mute(struct cdn_dp_device *dp, bool enable);
-int cdn_dp_audio_config(struct cdn_dp_device *dp, struct audio_info *audio);
-#endif /* _CDN_DP_REG_H */
+#endif /* CDNS_MHDP_H_ */ +#endif /* CDNS_MHDP_H_ */
-- --
2.29.2 2.29.2

1187
projects/Qualcomm/devices/Dragonboard/linux/linux.aarch64.conf
View File

File diff suppressed because it is too large Load Diff

3
projects/Rockchip/devices/RK3288/linux/default/linux.arm.conf
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/arm 5.10.44 Kernel Configuration # Linux/arm 5.10.52 Kernel Configuration
# #
# #
@ -2263,6 +2263,7 @@ CONFIG_BATTERY_CPCAP=y
# CONFIG_CHARGER_TPS65090 is not set # CONFIG_CHARGER_TPS65090 is not set
# CONFIG_CHARGER_TPS65217 is not set # CONFIG_CHARGER_TPS65217 is not set
# CONFIG_BATTERY_GAUGE_LTC2941 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set
# CONFIG_BATTERY_RT5033 is not set
# CONFIG_CHARGER_RT9455 is not set # CONFIG_CHARGER_RT9455 is not set
# CONFIG_CHARGER_CROS_USBPD is not set # CONFIG_CHARGER_CROS_USBPD is not set
# CONFIG_CHARGER_UCS1002 is not set # CONFIG_CHARGER_UCS1002 is not set

3
projects/Rockchip/devices/RK3328/linux/default/linux.aarch64.conf
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/arm64 5.10.44 Kernel Configuration # Linux/arm64 5.10.52 Kernel Configuration
# #
# #
@ -2437,6 +2437,7 @@ CONFIG_POWER_SUPPLY_HWMON=y
# CONFIG_CHARGER_BQ25980 is not set # CONFIG_CHARGER_BQ25980 is not set
# CONFIG_CHARGER_SMB347 is not set # CONFIG_CHARGER_SMB347 is not set
# CONFIG_BATTERY_GAUGE_LTC2941 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set
# CONFIG_BATTERY_RT5033 is not set
# CONFIG_CHARGER_RT9455 is not set # CONFIG_CHARGER_RT9455 is not set
# CONFIG_CHARGER_UCS1002 is not set # CONFIG_CHARGER_UCS1002 is not set
# CONFIG_CHARGER_BD99954 is not set # CONFIG_CHARGER_BD99954 is not set

3
projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/arm64 5.10.41 Kernel Configuration # Linux/arm64 5.10.52 Kernel Configuration
# #
# #
@ -2865,6 +2865,7 @@ CONFIG_POWER_SUPPLY_HWMON=y
# CONFIG_CHARGER_BQ25980 is not set # CONFIG_CHARGER_BQ25980 is not set
# CONFIG_CHARGER_SMB347 is not set # CONFIG_CHARGER_SMB347 is not set
# CONFIG_BATTERY_GAUGE_LTC2941 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set
# CONFIG_BATTERY_RT5033 is not set
# CONFIG_CHARGER_RT9455 is not set # CONFIG_CHARGER_RT9455 is not set
# CONFIG_CHARGER_UCS1002 is not set # CONFIG_CHARGER_UCS1002 is not set
# CONFIG_CHARGER_BD99954 is not set # CONFIG_CHARGER_BD99954 is not set

141
projects/Rockchip/patches/linux/default/linux-0004-rockchip-from-list.patch
View File

@ -1067,147 +1067,6 @@ index 000000000000..7007ddbcbdae
+MODULE_DESCRIPTION("DesignWare USB3 Rockchip Innosilicon Glue Layer"); +MODULE_DESCRIPTION("DesignWare USB3 Rockchip Innosilicon Glue Layer");
+MODULE_AUTHOR("Peter Geis <pgwipeout@gmail.com>"); +MODULE_AUTHOR("Peter Geis <pgwipeout@gmail.com>");
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Peter Geis <pgwipeout@gmail.com>
Date: Mon, 16 Nov 2020 15:17:35 +0000
Subject: [PATCH] arm64: dts: rockchip: add rk3328 usb3 and usb3phy nodes
Add the usb3 controller and usb3 phy nodes to the rk3328.
Signed-off-by: Peter Geis <pgwipeout@gmail.com>
---
arch/arm64/boot/dts/rockchip/rk3328.dtsi | 65 ++++++++++++++++++++++++
1 file changed, 65 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
index 17709faf651b..d327fd300116 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -856,6 +856,40 @@ u2phy_host: host-port {
};
};
+ usb3phy: usb3-phy@ff470000 {
+ compatible = "rockchip,rk3328-usb3phy";
+ reg = <0x0 0xff460000 0x0 0x10000>;
+ clocks = <&cru PCLK_USB3PHY_OTG>, <&cru PCLK_USB3PHY_PIPE>;
+ clock-names = "usb3phy-otg", "usb3phy-pipe";
+ resets = <&cru SRST_USB3PHY_U2>,
+ <&cru SRST_USB3PHY_U3>,
+ <&cru SRST_USB3PHY_PIPE>,
+ <&cru SRST_USB3OTG_UTMI>,
+ <&cru SRST_USB3PHY_OTG_P>,
+ <&cru SRST_USB3PHY_PIPE_P>;
+ reset-names = "usb3phy-u2-por", "usb3phy-u3-por",
+ "usb3phy-pipe-mac", "usb3phy-utmi-mac",
+ "usb3phy-utmi-apb", "usb3phy-pipe-apb";
+ #address-cells = <2>;
+ #size-cells = <2>;
+ ranges;
+ status = "disabled";
+
+ usb3phy_utmi: utmi@ff470000 {
+ compatible = "rockchip,rk3328-usb3phy-utmi";
+ reg = <0x0 0xff470000 0x0 0x8000>;
+ #phy-cells = <0>;
+ status = "disabled";
+ };
+
+ usb3phy_pipe: pipe@ff478000 {
+ compatible = "rockchip,rk3328-usb3phy-pipe";
+ reg = <0x0 0xff478000 0x0 0x8000>;
+ #phy-cells = <0>;
+ status = "disabled";
+ };
+ };
+
sdmmc: mmc@ff500000 {
compatible = "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc";
reg = <0x0 0xff500000 0x0 0x4000>;
@@ -987,6 +1021,37 @@ usb_host0_ohci: usb@ff5d0000 {
status = "disabled";
};
+ usbdrd3: usb@ff600000 {
+ compatible = "rockchip,rk3328-dwc3";
+ clocks = <&cru SCLK_USB3OTG_REF>, <&cru ACLK_USB3OTG>,
+ <&cru SCLK_USB3OTG_SUSPEND>;
+ clock-names = "ref", "bus_early", "suspend";
+ #address-cells = <2>;
+ #size-cells = <2>;
+ ranges;
+ status = "disabled";
+
+ usbdrd_dwc3: dwc3@ff600000 {
+ compatible = "snps,dwc3";
+ reg = <0x0 0xff600000 0x0 0x100000>;
+ interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&cru SCLK_USB3OTG_REF>, <&cru ACLK_USB3OTG>,
+ <&cru SCLK_USB3OTG_SUSPEND>;
+ clock-names = "ref", "bus_early", "suspend";
+ dr_mode = "host";
+ usb-phy = <&usb3phy_utmi>, <&usb3phy_pipe>;
+ phy_type = "utmi_wide";
+ snps,dis_enblslpm_quirk;
+ snps,dis-u2-freeclk-exists-quirk;
+ snps,dis_u2_susphy_quirk;
+ snps,dis_u3_susphy_quirk;
+ snps,dis-del-phy-power-chg-quirk;
+ snps,dis-tx-ipgap-linecheck-quirk;
+ snps,xhci-trb-ent-quirk;
+ status = "disabled";
+ };
+ };
+
gic: interrupt-controller@ff811000 {
compatible = "arm,gic-400";
#interrupt-cells = <3>;
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Peter Geis <pgwipeout@gmail.com>
Date: Mon, 16 Nov 2020 15:17:36 +0000
Subject: [PATCH] arm64: dts: rockchip: enable usb3 on rk3328-roc-cc board
Enable the usb3 controller and usb3 phy nodes on the rk3328-roc-cc board file.
Signed-off-by: Peter Geis <pgwipeout@gmail.com>
---
.../arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 21 +++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
index 19959bfba451..3ac876c08d61 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
@@ -366,6 +366,27 @@ &usb_host0_ohci {
status = "okay";
};
+&usbdrd3 {
+ status = "okay";
+};
+
+&usbdrd_dwc3 {
+ dr_mode = "host";
+ status = "okay";
+};
+
+&usb3phy {
+ status = "okay";
+};
+
+&usb3phy_utmi {
+ status = "okay";
+};
+
+&usb3phy_pipe {
+ status = "okay";
+};
+
&vop {
status = "okay";
};
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se> From: Jonas Karlman <jonas@kwiboo.se>
Date: Sun, 17 Feb 2019 22:14:38 +0000 Date: Sun, 17 Feb 2019 22:14:38 +0000

133
projects/Rockchip/patches/linux/default/linux-1003-for-libreelec.patch
View File

@ -1,79 +1,3 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Alex Bee <knaerzche@gmail.com>
Date: Sat, 16 Jan 2021 12:24:58 +0000
Subject: [PATCH] arm64: dts: rockchip: enable USB3 for supported RK3328 boards
Signed-off-by: Alex Bee <knaerzche@gmail.com>
---
arch/arm64/boot/dts/rockchip/rk3328-a1.dts | 21 +++++++++++++++++++
.../arm64/boot/dts/rockchip/rk3328-rock64.dts | 21 +++++++++++++++++++
2 files changed, 42 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-a1.dts b/arch/arm64/boot/dts/rockchip/rk3328-a1.dts
index 37f307cfa4cc..4013f16bb368 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-a1.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-a1.dts
@@ -352,6 +352,27 @@ &usb_host0_ehci {
status = "okay";
};
+&usbdrd3 {
+ status = "okay";
+};
+
+&usbdrd_dwc3 {
+ dr_mode = "host";
+ status = "okay";
+};
+
+&usb3phy {
+ status = "okay";
+};
+
+&usb3phy_utmi {
+ status = "okay";
+};
+
+&usb3phy_pipe {
+ status = "okay";
+};
+
&vop {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
index c984662043da..89fde87f7650 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
@@ -384,6 +384,27 @@ &usb_host0_ohci {
status = "okay";
};
+&usbdrd3 {
+ status = "okay";
+};
+
+&usbdrd_dwc3 {
+ dr_mode = "host";
+ status = "okay";
+};
+
+&usb3phy {
+ status = "okay";
+};
+
+&usb3phy_utmi {
+ status = "okay";
+};
+
+&usb3phy_pipe {
+ status = "okay";
+};
+
&vop {
status = "okay";
};
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Alex Bee <knaerzche@gmail.com> From: Alex Bee <knaerzche@gmail.com>
Date: Wed, 2 Sep 2020 19:52:02 +0200 Date: Wed, 2 Sep 2020 19:52:02 +0200
@ -97,11 +21,11 @@ index bd0ec27cf49b..21e32ddb21a0 100644
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
+ pd_gpu@RK3328_PD_GPU { + power-domain@RK3328_PD_GPU {
+ reg = <RK3328_PD_GPU>; + reg = <RK3328_PD_GPU>;
+ clocks = <&cru ACLK_GPU>; + clocks = <&cru ACLK_GPU>;
+ }; + };
pd_hevc@RK3328_PD_HEVC { power-domain@RK3328_PD_HEVC {
reg = <RK3328_PD_HEVC>; reg = <RK3328_PD_HEVC>;
}; };
@@ -546,6 +550,11 @@ map0 { @@ -546,6 +550,11 @@ map0 {
@ -829,33 +753,6 @@ index fb7599f07af4..155f22b53103 100644
mmc-hs400-enhanced-strobe; mmc-hs400-enhanced-strobe;
non-removable; non-removable;
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Alex Bee <knaerzche@gmail.com>
Date: Tue, 1 Jun 2021 19:37:07 +0200
Subject: [PATCH] arm64: dts: rockchip: re-add regulator-always-on for vdd_vpu
Seems to be required by panfrost.
Fixes: ec7d731d81e7 ("arm64: dts: rockchip: Add node for gpu on rk3399-roc-pc")
Signed-off-by: Alex Bee <knaerzche@gmail.com>
---
arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
index 20309076dbac..e4345e5bdfb6 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
@@ -488,6 +488,8 @@ vdd_gpu: regulator@41 {
regulator-min-microvolt = <712500>;
regulator-max-microvolt = <1500000>;
regulator-ramp-delay = <1000>;
+ regulator-always-on;
+ regulator-boot-on;
vin-supply = <&vcc3v3_sys>;
regulator-state-mem {
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com> From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Tue, 1 Jun 2021 19:42:31 +0200 Date: Tue, 1 Jun 2021 19:42:31 +0200
@ -986,29 +883,3 @@ index 7257494d2831..9e2994e27d05 100644
}; };
sdio-pwrseq { sdio-pwrseq {
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Alex Bee <knaerzche@gmail.com>
Date: Fri, 4 Jun 2021 22:19:32 +0200
Subject: [PATCH] arm64: dts: rockchip: Re-add regulator-always-on property for
vcc_sdio for RK3399-ROC-PC
Otherwise the board is not able to reboot.
Fixes: 04a0077fdb19 ("arm64: dts: rockchip: Remove always-on properties from regulator nodes on rk3399-roc-pc.")
Signed-off-by: Alex Bee <knaerzche@gmail.com>
---
arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
index e4345e5bdfb6..03f2dcff8490 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
@@ -385,6 +385,7 @@ regulator-state-mem {
vcc_sdio: LDO_REG4 {
regulator-name = "vcc_sdio";
regulator-boot-on;
+ regulator-always-on;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3000000>;
regulator-state-mem {

38
projects/Rockchip/patches/linux/default/linux-2000-v4l-wip-rkvdec-vp9.patch
View File

@ -1,41 +1,3 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Ezequiel Garcia <ezequiel@collabora.com>
Date: Mon, 2 Nov 2020 21:05:49 +0200
Subject: [PATCH] media: rkvdec: Fix .buf_prepare
The driver should only set the payload on .buf_prepare if the
buffer is CAPTURE type. If an OUTPUT buffer has a zero bytesused
set by userspace then v4l2-core will set it to buffer length.
Fixes: cd33c830448ba ("media: rkvdec: Add the rkvdec driver")
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.com>
---
drivers/staging/media/rkvdec/rkvdec.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c
index 4111155d62f4..c4e0ec16c285 100644
--- a/drivers/staging/media/rkvdec/rkvdec.c
+++ b/drivers/staging/media/rkvdec/rkvdec.c
@@ -546,7 +546,15 @@ static int rkvdec_buf_prepare(struct vb2_buffer *vb)
if (vb2_plane_size(vb, i) < sizeimage)
return -EINVAL;
}
- vb2_set_plane_payload(vb, 0, f->fmt.pix_mp.plane_fmt[0].sizeimage);
+
+ /*
+ * Buffer bytesused is written by driver for CAPTURE buffers.
+ * (if userspace passes 0 bytesused for OUTPUT buffers, v4l2-core sets
+ * it to buffer length).
+ */
+ if (!V4L2_TYPE_IS_OUTPUT(vq->type))
+ vb2_set_plane_payload(vb, 0, f->fmt.pix_mp.plane_fmt[0].sizeimage);
+
return 0;
}
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Brezillon <boris.brezillon@collabora.com> From: Boris Brezillon <boris.brezillon@collabora.com>
Date: Mon, 2 Nov 2020 21:05:50 +0200 Date: Mon, 2 Nov 2020 21:05:50 +0200

18
projects/Rockchip/patches/linux/default/linux-2001-v4l-wip-rkvdec-hevc.patch
View File

@ -2464,7 +2464,7 @@ index 000000000000..03ba848411c6
+ /* write pps */ + /* write pps */
+ WRITE_PPS(pps->pic_parameter_set_id, PIC_PARAMETER_SET_ID); + WRITE_PPS(pps->pic_parameter_set_id, PIC_PARAMETER_SET_ID);
+ WRITE_PPS(sps->seq_parameter_set_id, PPS_SEQ_PARAMETER_SET_ID); + WRITE_PPS(sps->seq_parameter_set_id, PPS_SEQ_PARAMETER_SET_ID);
+ WRITE_PPS(!!(pps->flags & V4L2_HEVC_PPS_FLAG_DEPENDENT_SLICE_SEGMENT), + WRITE_PPS(!!(pps->flags & V4L2_HEVC_PPS_FLAG_DEPENDENT_SLICE_SEGMENT_ENABLED),
+ DEPENDENT_SLICE_SEGMENTS_ENABLED_FLAG); + DEPENDENT_SLICE_SEGMENTS_ENABLED_FLAG);
+ WRITE_PPS(!!(pps->flags & V4L2_HEVC_PPS_FLAG_OUTPUT_FLAG_PRESENT), + WRITE_PPS(!!(pps->flags & V4L2_HEVC_PPS_FLAG_OUTPUT_FLAG_PRESENT),
+ OUTPUT_FLAG_PRESENT_FLAG); + OUTPUT_FLAG_PRESENT_FLAG);
@ -3164,8 +3164,7 @@ Subject: [PATCH] WIP: media: rkvdec: hevc: implement lowdelay
Signed-off-by: Alex Bee <knaerzche@gmail.com> Signed-off-by: Alex Bee <knaerzche@gmail.com>
--- ---
drivers/staging/media/rkvdec/rkvdec-hevc.c | 16 ++++++++++++++-- drivers/staging/media/rkvdec/rkvdec-hevc.c | 16 ++++++++++++++--
include/media/hevc-ctrls.h | 1 + 1 files changed, 14 insertions(+), 2 deletions(-)
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/media/rkvdec/rkvdec-hevc.c b/drivers/staging/media/rkvdec/rkvdec-hevc.c diff --git a/drivers/staging/media/rkvdec/rkvdec-hevc.c b/drivers/staging/media/rkvdec/rkvdec-hevc.c
index 93b4e09e5bf1..8a94fc04980f 100644 index 93b4e09e5bf1..8a94fc04980f 100644
@ -3208,19 +3207,6 @@ index 93b4e09e5bf1..8a94fc04980f 100644
WRITE_RPS(sl_params->long_term_ref_pic_set_size + WRITE_RPS(sl_params->long_term_ref_pic_set_size +
sl_params->short_term_ref_pic_set_size, sl_params->short_term_ref_pic_set_size,
diff --git a/include/media/hevc-ctrls.h b/include/media/hevc-ctrls.h
index b33e1a8141e1..bda0ea61f331 100644
--- a/include/media/hevc-ctrls.h
+++ b/include/media/hevc-ctrls.h
@@ -168,6 +168,7 @@ struct v4l2_hevc_pred_weight_table {
#define V4L2_HEVC_SLICE_PARAMS_FLAG_USE_INTEGER_MV (1ULL << 6)
#define V4L2_HEVC_SLICE_PARAMS_FLAG_SLICE_DEBLOCKING_FILTER_DISABLED (1ULL << 7)
#define V4L2_HEVC_SLICE_PARAMS_FLAG_SLICE_LOOP_FILTER_ACROSS_SLICES_ENABLED (1ULL << 8)
+#define V4L2_HEVC_SLICE_PARAMS_FLAG_DEPENDENT_SLICE_SEGMENT (1ULL << 9)
struct v4l2_ctrl_hevc_slice_params {
__u32 bit_size;
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Alex Bee <knaerzche@gmail.com> From: Alex Bee <knaerzche@gmail.com>
Date: Sat, 30 Jan 2021 18:16:39 +0100 Date: Sat, 30 Jan 2021 18:16:39 +0100

478
projects/Samsung/linux/linux.arm.conf
View File

File diff suppressed because it is too large Load Diff