mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 13:16:41 +00:00
linux (Allwinner): rebase patches for 5.19.2-rc1
This commit is contained in:
parent
8a0e2b2d69
commit
e59e3b11a1
@ -55,13 +55,13 @@ Signed-off-by: Samuel Holland <samuel@sholland.org>
|
|||||||
|
|
||||||
static int scpi_remove(struct platform_device *pdev)
|
static int scpi_remove(struct platform_device *pdev)
|
||||||
@@ -913,6 +919,7 @@ static int scpi_probe(struct platform_de
|
@@ -913,6 +919,7 @@ static int scpi_probe(struct platform_de
|
||||||
struct resource res;
|
|
||||||
struct device *dev = &pdev->dev;
|
struct device *dev = &pdev->dev;
|
||||||
struct device_node *np = dev->of_node;
|
struct device_node *np = dev->of_node;
|
||||||
|
struct scpi_drvinfo *scpi_drvinfo;
|
||||||
+ bool use_mbox_names = false;
|
+ bool use_mbox_names = false;
|
||||||
|
|
||||||
scpi_info = devm_kzalloc(dev, sizeof(*scpi_info), GFP_KERNEL);
|
scpi_drvinfo = devm_kzalloc(dev, sizeof(*scpi_drvinfo), GFP_KERNEL);
|
||||||
if (!scpi_info)
|
if (!scpi_drvinfo)
|
||||||
@@ -926,6 +933,14 @@ static int scpi_probe(struct platform_de
|
@@ -926,6 +933,14 @@ static int scpi_probe(struct platform_de
|
||||||
dev_err(dev, "no mboxes property in '%pOF'\n", np);
|
dev_err(dev, "no mboxes property in '%pOF'\n", np);
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
@ -1,28 +1,39 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
From e4b8d13f19b988a17de0226f3f8a7d03e72eac37 Mon Sep 17 00:00:00 2001
|
||||||
From: Jernej Skrabec <jernej.skrabec@gmail.com>
|
From: Jernej Skrabec <jernej.skrabec@gmail.com>
|
||||||
Date: Sun, 27 Feb 2022 15:21:05 +0100
|
Date: Wed, 6 Jul 2022 19:29:01 +0100
|
||||||
Subject: [PATCH] media: hantro: sunxi: Enable 10-bit decoding
|
Subject: [PATCH] media: hantro: sunxi: Enable 10-bit decoding
|
||||||
|
|
||||||
Now that infrastructure for 10-bit decoding exists, enable it for
|
Now that infrastructure for 10-bit decoding exists, enable it for
|
||||||
Allwinner H6.
|
Allwinner H6.
|
||||||
|
|
||||||
|
Tested-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
|
||||||
Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
|
Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
|
||||||
|
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
|
||||||
|
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
|
||||||
---
|
---
|
||||||
drivers/staging/media/hantro/sunxi_vpu_hw.c | 11 +++++++++++
|
drivers/staging/media/hantro/sunxi_vpu_hw.c | 27 +++++++++++++++++++++
|
||||||
1 file changed, 11 insertions(+)
|
1 file changed, 27 insertions(+)
|
||||||
|
|
||||||
diff --git a/drivers/staging/media/hantro/sunxi_vpu_hw.c b/drivers/staging/media/hantro/sunxi_vpu_hw.c
|
diff --git a/drivers/staging/media/hantro/sunxi_vpu_hw.c b/drivers/staging/media/hantro/sunxi_vpu_hw.c
|
||||||
index c0edd5856a0c..8d8a8937d6aa 100644
|
index fbeac81e59e133..02ce8b064a8f0c 100644
|
||||||
--- a/drivers/staging/media/hantro/sunxi_vpu_hw.c
|
--- a/drivers/staging/media/hantro/sunxi_vpu_hw.c
|
||||||
+++ b/drivers/staging/media/hantro/sunxi_vpu_hw.c
|
+++ b/drivers/staging/media/hantro/sunxi_vpu_hw.c
|
||||||
@@ -15,12 +15,23 @@ static const struct hantro_fmt sunxi_vpu_postproc_fmts[] = {
|
@@ -23,12 +23,39 @@ static const struct hantro_fmt sunxi_vpu_postproc_fmts[] = {
|
||||||
.codec_mode = HANTRO_MODE_NONE,
|
.step_height = 32,
|
||||||
.postprocessed = true,
|
},
|
||||||
},
|
},
|
||||||
+ {
|
+ {
|
||||||
+ .fourcc = V4L2_PIX_FMT_P010,
|
+ .fourcc = V4L2_PIX_FMT_P010,
|
||||||
+ .codec_mode = HANTRO_MODE_NONE,
|
+ .codec_mode = HANTRO_MODE_NONE,
|
||||||
+ .postprocessed = true,
|
+ .postprocessed = true,
|
||||||
|
+ .frmsize = {
|
||||||
|
+ .min_width = FMT_MIN_WIDTH,
|
||||||
|
+ .max_width = FMT_UHD_WIDTH,
|
||||||
|
+ .step_width = 32,
|
||||||
|
+ .min_height = FMT_MIN_HEIGHT,
|
||||||
|
+ .max_height = FMT_UHD_HEIGHT,
|
||||||
|
+ .step_height = 32,
|
||||||
|
+ },
|
||||||
+ },
|
+ },
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -31,11 +42,19 @@ index c0edd5856a0c..8d8a8937d6aa 100644
|
|||||||
.fourcc = V4L2_PIX_FMT_NV12_4L4,
|
.fourcc = V4L2_PIX_FMT_NV12_4L4,
|
||||||
.codec_mode = HANTRO_MODE_NONE,
|
.codec_mode = HANTRO_MODE_NONE,
|
||||||
+ .match_depth = true,
|
+ .match_depth = true,
|
||||||
|
+ .frmsize = {
|
||||||
|
+ .min_width = FMT_MIN_WIDTH,
|
||||||
|
+ .max_width = FMT_UHD_WIDTH,
|
||||||
|
+ .step_width = 32,
|
||||||
|
+ .min_height = FMT_MIN_HEIGHT,
|
||||||
|
+ .max_height = FMT_UHD_HEIGHT,
|
||||||
|
+ .step_height = 32,
|
||||||
|
+ },
|
||||||
+ },
|
+ },
|
||||||
+ {
|
+ {
|
||||||
+ .fourcc = V4L2_PIX_FMT_P010_4L4,
|
+ .fourcc = V4L2_PIX_FMT_P010_4L4,
|
||||||
+ .codec_mode = HANTRO_MODE_NONE,
|
+ .codec_mode = HANTRO_MODE_NONE,
|
||||||
+ .match_depth = true,
|
+ .match_depth = true,
|
||||||
},
|
.frmsize = {
|
||||||
{
|
.min_width = FMT_MIN_WIDTH,
|
||||||
.fourcc = V4L2_PIX_FMT_VP9_FRAME,
|
.max_width = FMT_UHD_WIDTH,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user