Commit 00c43088 authored by Maxime Jourdan's avatar Maxime Jourdan Committed by Mauro Carvalho Chehab
Browse files

media: meson: vdec: add VP9 decoder support 



This adds VP9 decoding for the Amlogic GXL, G12A & SM1 SoCs, using
the commong "HEVC" HW decoder.

For G12A & SM1, it uses the IOMMU support from the firmware.

For 10bit decoding, the firmware can only decode in the proprietary
Amlogic Framebuffer Compression format, but can output in 8bit NV12
buffer while writing the decoded frame.

Signed-off-by: default avatarMaxime Jourdan <mjourdan@baylibre.com>
Signed-off-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Tested-by: default avatarKevin Hilman <khilman@baylibre.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent e9a3eb48

drivers/staging/media/meson/vdec/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,6 +3,6 @@ 


meson-vdec-objs = esparser.o vdec.o vdec_helpers.o vdec_platform.o

meson-vdec-objs += vdec_1.o vdec_hevc.o

meson-vdec-objs += codec_mpeg12.o codec_h264.o codec_hevc_common.o

meson-vdec-objs += codec_mpeg12.o codec_h264.o codec_hevc_common.o codec_vp9.o



obj-$(CONFIG_VIDEO_MESON_VDEC) += meson-vdec.o

drivers/staging/media/meson/vdec/codec_vp9.c

0 → 100644
+2141 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/staging/media/meson/vdec/codec_vp9.h

0 → 100644
+13 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0+ */

/*

 * Copyright (C) 2018 Maxime Jourdan <maxi.jourdan@wanadoo.fr>

 */



#ifndef __MESON_VDEC_CODEC_VP9_H_

#define __MESON_VDEC_CODEC_VP9_H_



#include "vdec.h"



extern struct amvdec_codec_ops codec_vp9_ops;



#endif

drivers/staging/media/meson/vdec/hevc_regs.h

+7 −0
Original line number Diff line number Diff line
@@ -122,6 +122,8 @@ 
#define HEVC_MPRED_L0_REF00_POC 0xc880

#define HEVC_MPRED_L1_REF00_POC 0xc8c0



#define HEVC_MPRED_CTRL4 0xc930



#define HEVC_MPRED_CUR_POC 0xc980

#define HEVC_MPRED_COL_POC 0xc984

#define HEVC_MPRED_MV_RD_END_ADDR 0xc988
@@ -140,6 +142,10 @@ 
#define HEVCD_IPP_LINEBUFF_BASE 0xd024

#define HEVCD_IPP_AXIIF_CONFIG 0xd02c



#define VP9D_MPP_REF_SCALE_ENBL		0xd104

#define VP9D_MPP_REFINFO_TBL_ACCCONFIG	0xd108

#define VP9D_MPP_REFINFO_DATA		0xd10c



#define HEVCD_MPP_ANC2AXI_TBL_CONF_ADDR 0xd180

#define HEVCD_MPP_ANC2AXI_TBL_CMD_ADDR 0xd184

#define HEVCD_MPP_ANC2AXI_TBL_DATA 0xd190
@@ -164,6 +170,7 @@ 
#define HEVC_DBLK_CFG9 0xd424

#define HEVC_DBLK_CFGA 0xd428

#define HEVC_DBLK_STS0 0xd42c

#define HEVC_DBLK_CFGB 0xd42c

#define HEVC_DBLK_STS1 0xd430

#define HEVC_DBLK_CFGE 0xd438

drivers/staging/media/meson/vdec/vdec.c

+5 −0
Original line number Diff line number Diff line
@@ -395,6 +395,7 @@ static void vdec_reset_bufs_recycle(struct amvdec_session *sess) 
static void vdec_stop_streaming(struct vb2_queue *q)

{

	struct amvdec_session *sess = vb2_get_drv_priv(q);

	struct amvdec_codec_ops *codec_ops = sess->fmt_out->codec_ops;

	struct amvdec_core *core = sess->core;

	struct vb2_v4l2_buffer *buf;
@@ -423,6 +424,10 @@ static void vdec_stop_streaming(struct vb2_queue *q) 


		sess->streamon_out = 0;

	} else {

		/* Drain remaining refs if was still running */

		if (sess->status >= STATUS_RUNNING && codec_ops->drain)

			codec_ops->drain(sess);



		while ((buf = v4l2_m2m_dst_buf_remove(sess->m2m_ctx)))

			v4l2_m2m_buf_done(buf, VB2_BUF_STATE_ERROR);