diff options
| author | Som Qin <som.qin@starfivetech.com> | 2023-08-02 11:38:51 +0800 |
|---|---|---|
| committer | Seung-Woo Kim <sw0312.kim@samsung.com> | 2023-10-05 18:26:30 +0900 |
| commit | 976e12158ed88fa74dd92a1d70a38be62484ff1c (patch) | |
| tree | 61c9c082a7ee715acf2959639703db6054eedb74 | |
| parent | f7766ab98ce710f711846b1aa72a88526318f60a (diff) | |
| download | linux-starfive-976e12158ed88fa74dd92a1d70a38be62484ff1c.tar.gz linux-starfive-976e12158ed88fa74dd92a1d70a38be62484ff1c.tar.bz2 linux-starfive-976e12158ed88fa74dd92a1d70a38be62484ff1c.zip | |
Media:Wave5: Add contiguous planes format support (YUV420/NV12/NV21)
Signed-off-by: Som Qin <som.qin@starfivetech.com>
[sw0312.kim: cherry-pick the commit 80c6e7df80bd from https://github.com/starfive-tech/linux/tree/JH7110_VisionFive2_6.1.y_devel]
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Change-Id: I4203a253b3c7577a5849ca2582099a2cf07985ea
| -rw-r--r-- | drivers/media/platform/chips-media/wave5/wave5-helper.h | 2 | ||||
| -rw-r--r-- | drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/platform/chips-media/wave5/wave5-helper.h b/drivers/media/platform/chips-media/wave5/wave5-helper.h index 8a8dda8242f6..d586d624275e 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-helper.h +++ b/drivers/media/platform/chips-media/wave5/wave5-helper.h @@ -11,7 +11,7 @@ #include "wave5-vpu.h" #define FMT_TYPES 2 -#define MAX_FMTS 3 +#define MAX_FMTS 6 void wave5_cleanup_instance(struct vpu_instance *inst); int wave5_vpu_release_device(struct file *filp, diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c b/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c index f3e81243d866..5d10f3c7365a 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c @@ -29,43 +29,43 @@ static const struct vpu_format dec_fmt_list[FMT_TYPES][MAX_FMTS] = { }, }, [VPU_FMT_TYPE_RAW] = { - /*{ - .v4l2_pix_fmt = V4L2_PIX_FMT_YUV420, + { + .v4l2_pix_fmt = V4L2_PIX_FMT_YUV420M, .max_width = 8192, .min_width = 8, .max_height = 4320, .min_height = 8, }, { - .v4l2_pix_fmt = V4L2_PIX_FMT_NV12, + .v4l2_pix_fmt = V4L2_PIX_FMT_NV12M, .max_width = 8192, .min_width = 8, .max_height = 4320, .min_height = 8, }, { - .v4l2_pix_fmt = V4L2_PIX_FMT_NV21, + .v4l2_pix_fmt = V4L2_PIX_FMT_NV21M, .max_width = 8192, .min_width = 8, .max_height = 4320, .min_height = 8, - },*/ + }, { - .v4l2_pix_fmt = V4L2_PIX_FMT_YUV420M, + .v4l2_pix_fmt = V4L2_PIX_FMT_YUV420, .max_width = 8192, .min_width = 8, .max_height = 4320, .min_height = 8, }, { - .v4l2_pix_fmt = V4L2_PIX_FMT_NV12M, + .v4l2_pix_fmt = V4L2_PIX_FMT_NV12, .max_width = 8192, .min_width = 8, .max_height = 4320, .min_height = 8, }, { - .v4l2_pix_fmt = V4L2_PIX_FMT_NV21M, + .v4l2_pix_fmt = V4L2_PIX_FMT_NV21, .max_width = 8192, .min_width = 8, .max_height = 4320, |