linux (Rockchip): rebase patches for 6.1-rc1

This commit is contained in:
Rudi Heitbaum 2022-10-17 09:29:46 +00:00
parent df48e6d567
commit 82335a3b2f
2 changed files with 4 additions and 5851 deletions

View File

@ -414,13 +414,13 @@ Required to proper decode H.264@4K
Signed-off-by: Alex Bee <knaerzche@gmail.com> Signed-off-by: Alex Bee <knaerzche@gmail.com>
--- ---
drivers/staging/media/hantro/rockchip_vpu_hw.c | 14 +++++++++++--- drivers/media/platform/verisilicon/rockchip_vpu_hw.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-) 1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/media/hantro/rockchip_vpu_hw.c b/drivers/staging/media/hantro/rockchip_vpu_hw.c diff --git a/drivers/media/platform/verisilicon/rockchip_vpu_hw.c b/drivers/media/platform/verisilicon/rockchip_vpu_hw.c
index 8de6fd2e8eef..002b1a600f93 100644 index 8de6fd2e8eef..002b1a600f93 100644
--- a/drivers/staging/media/hantro/rockchip_vpu_hw.c --- a/drivers/media/platform/verisilicon/rockchip_vpu_hw.c
+++ b/drivers/staging/media/hantro/rockchip_vpu_hw.c +++ b/drivers/media/platform/verisilicon/rockchip_vpu_hw.c
@@ -15,7 +15,8 @@ @@ -15,7 +15,8 @@
#include "rockchip_vpu2_regs.h" #include "rockchip_vpu2_regs.h"