[PATCH v3 1/6] media: cedrus: Register all codecs as capability

[Martin Cerveny]

All codecs should have capabilities.
For example "Allwinner V3s" does not support "MPEG2".

Signed-off-by: Martin Cerveny <m.cerv...@computer.org>
---
 drivers/staging/media/sunxi/cedrus/cedrus.c   | 22 +++++++++++++++++--
 drivers/staging/media/sunxi/cedrus/cedrus.h   |  2 ++
 .../staging/media/sunxi/cedrus/cedrus_video.c |  2 ++
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.c 
b/drivers/staging/media/sunxi/cedrus/cedrus.c
index 9a102b7c1bb9..3487554fab68 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus.c
@@ -486,47 +486,65 @@ static int cedrus_remove(struct platform_device *pdev)
 }
 
 static const struct cedrus_variant sun4i_a10_cedrus_variant = {
+       .capabilities   = CEDRUS_CAPABILITY_MPEG2_DEC |
+                         CEDRUS_CAPABILITY_H264_DEC,
        .mod_rate       = 320000000,
 };
 
 static const struct cedrus_variant sun5i_a13_cedrus_variant = {
+       .capabilities   = CEDRUS_CAPABILITY_MPEG2_DEC |
+                         CEDRUS_CAPABILITY_H264_DEC,
        .mod_rate       = 320000000,
 };
 
 static const struct cedrus_variant sun7i_a20_cedrus_variant = {
+       .capabilities   = CEDRUS_CAPABILITY_MPEG2_DEC |
+                         CEDRUS_CAPABILITY_H264_DEC,
        .mod_rate       = 320000000,
 };
 
 static const struct cedrus_variant sun8i_a33_cedrus_variant = {
-       .capabilities   = CEDRUS_CAPABILITY_UNTILED,
+       .capabilities   = CEDRUS_CAPABILITY_UNTILED |
+                         CEDRUS_CAPABILITY_MPEG2_DEC |
+                         CEDRUS_CAPABILITY_H264_DEC,
        .mod_rate       = 320000000,
 };
 
 static const struct cedrus_variant sun8i_h3_cedrus_variant = {
        .capabilities   = CEDRUS_CAPABILITY_UNTILED |
+                         CEDRUS_CAPABILITY_MPEG2_DEC |
+                         CEDRUS_CAPABILITY_H264_DEC |
                          CEDRUS_CAPABILITY_H265_DEC,
        .mod_rate       = 402000000,
 };
 
 static const struct cedrus_variant sun8i_r40_cedrus_variant = {
-       .capabilities   = CEDRUS_CAPABILITY_UNTILED,
+       .capabilities   = CEDRUS_CAPABILITY_UNTILED |
+                         CEDRUS_CAPABILITY_MPEG2_DEC |
+                         CEDRUS_CAPABILITY_H264_DEC,
        .mod_rate       = 297000000,
 };
 
 static const struct cedrus_variant sun50i_a64_cedrus_variant = {
        .capabilities   = CEDRUS_CAPABILITY_UNTILED |
+                         CEDRUS_CAPABILITY_MPEG2_DEC |
+                         CEDRUS_CAPABILITY_H264_DEC |
                          CEDRUS_CAPABILITY_H265_DEC,
        .mod_rate       = 402000000,
 };
 
 static const struct cedrus_variant sun50i_h5_cedrus_variant = {
        .capabilities   = CEDRUS_CAPABILITY_UNTILED |
+                         CEDRUS_CAPABILITY_MPEG2_DEC |
+                         CEDRUS_CAPABILITY_H264_DEC |
                          CEDRUS_CAPABILITY_H265_DEC,
        .mod_rate       = 402000000,
 };
 
 static const struct cedrus_variant sun50i_h6_cedrus_variant = {
        .capabilities   = CEDRUS_CAPABILITY_UNTILED |
+                         CEDRUS_CAPABILITY_MPEG2_DEC |
+                         CEDRUS_CAPABILITY_H264_DEC |
                          CEDRUS_CAPABILITY_H265_DEC,
        .quirks         = CEDRUS_QUIRK_NO_DMA_OFFSET,
        .mod_rate       = 600000000,
diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.h 
b/drivers/staging/media/sunxi/cedrus/cedrus.h
index 93c843ae14bb..30cdb15d6800 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus.h
+++ b/drivers/staging/media/sunxi/cedrus/cedrus.h
@@ -28,6 +28,8 @@
 
 #define CEDRUS_CAPABILITY_UNTILED      BIT(0)
 #define CEDRUS_CAPABILITY_H265_DEC     BIT(1)
+#define CEDRUS_CAPABILITY_H264_DEC     BIT(2)
+#define CEDRUS_CAPABILITY_MPEG2_DEC    BIT(3)
 
 #define CEDRUS_QUIRK_NO_DMA_OFFSET     BIT(0)
 
diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_video.c 
b/drivers/staging/media/sunxi/cedrus/cedrus_video.c
index 911f607d9b09..bdca23fc214b 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus_video.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_video.c
@@ -38,10 +38,12 @@ static struct cedrus_format cedrus_formats[] = {
        {
                .pixelformat    = V4L2_PIX_FMT_MPEG2_SLICE,
                .directions     = CEDRUS_DECODE_SRC,
+               .capabilities   = CEDRUS_CAPABILITY_MPEG2_DEC,
        },
        {
                .pixelformat    = V4L2_PIX_FMT_H264_SLICE,
                .directions     = CEDRUS_DECODE_SRC,
+               .capabilities   = CEDRUS_CAPABILITY_H264_DEC,
        },
        {
                .pixelformat    = V4L2_PIX_FMT_HEVC_SLICE,
-- 
2.25.1

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel