openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] VPU: mediatek: Add decode support 

VPU driver add decode support

[mchehab@s-opensource.org: fix a kernel-doc markup]

Signed-off-by: Andrew-CT Chen <andrew-ct.chen@mediatek.com>
Signed-off-by: Tiffany Lin <tiffany.lin@mediatek.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Andrew-CT Chen 2016-09-02 09:19:52 -03:00 committed by Mauro Carvalho Chehab
parent 3467c9a7e7
commit e2818a59f7
2 changed files with 47 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/media/platform/mtk-vpu/mtk_vpu.c
View File

@ -134,6 +134,8 @@ struct vpu_wdt {
* *
* @signaled: the signal of vpu initialization completed * @signaled: the signal of vpu initialization completed
* @fw_ver: VPU firmware version * @fw_ver: VPU firmware version
* @dec_capability: decoder capability which is not used for now and
* the value is reserved for future use
* @enc_capability: encoder capability which is not used for now and * @enc_capability: encoder capability which is not used for now and
* the value is reserved for future use * the value is reserved for future use
* @wq: wait queue for VPU initialization status * @wq: wait queue for VPU initialization status
@ -141,6 +143,7 @@ struct vpu_wdt {
struct vpu_run { struct vpu_run {
u32 signaled; u32 signaled;
char fw_ver[VPU_FW_VER_LEN]; char fw_ver[VPU_FW_VER_LEN];
unsigned int dec_capability;
unsigned int enc_capability; unsigned int enc_capability;
wait_queue_head_t wq; wait_queue_head_t wq;
}; };
@ -415,6 +418,14 @@ int vpu_wdt_reg_handler(struct platform_device *pdev,
} }
EXPORT_SYMBOL_GPL(vpu_wdt_reg_handler); EXPORT_SYMBOL_GPL(vpu_wdt_reg_handler);
unsigned int vpu_get_vdec_hw_capa(struct platform_device *pdev)
{
struct mtk_vpu *vpu = platform_get_drvdata(pdev);
return vpu->run.dec_capability;
}
EXPORT_SYMBOL_GPL(vpu_get_vdec_hw_capa);
unsigned int vpu_get_venc_hw_capa(struct platform_device *pdev) unsigned int vpu_get_venc_hw_capa(struct platform_device *pdev)
{ {
struct mtk_vpu *vpu = platform_get_drvdata(pdev); struct mtk_vpu *vpu = platform_get_drvdata(pdev);
@ -600,6 +611,7 @@ static void vpu_init_ipi_handler(void *data, unsigned int len, void *priv)
vpu->run.signaled = run->signaled; vpu->run.signaled = run->signaled;
strncpy(vpu->run.fw_ver, run->fw_ver, VPU_FW_VER_LEN); strncpy(vpu->run.fw_ver, run->fw_ver, VPU_FW_VER_LEN);
vpu->run.dec_capability = run->dec_capability;
vpu->run.enc_capability = run->enc_capability; vpu->run.enc_capability = run->enc_capability;
wake_up_interruptible(&vpu->run.wq); wake_up_interruptible(&vpu->run.wq);
} }

43
drivers/media/platform/mtk-vpu/mtk_vpu.h
View File

@ -31,21 +31,36 @@ typedef void (*ipi_handler_t) (void *data,
* enum ipi_id - the id of inter-processor interrupt * enum ipi_id - the id of inter-processor interrupt
* *
* @IPI_VPU_INIT: The interrupt from vpu is to notfiy kernel * @IPI_VPU_INIT: The interrupt from vpu is to notfiy kernel
VPU initialization completed. * VPU initialization completed.
IPI_VPU_INIT is sent from VPU when firmware is * IPI_VPU_INIT is sent from VPU when firmware is
loaded. AP doesn't need to send IPI_VPU_INIT * loaded. AP doesn't need to send IPI_VPU_INIT
command to VPU. * command to VPU.
For other IPI below, AP should send the request * For other IPI below, AP should send the request
to VPU to trigger the interrupt. * to VPU to trigger the interrupt.
* @IPI_VDEC_H264: The interrupt from vpu is to notify kernel to
* handle H264 vidoe decoder job, and vice versa.
* Decode output format is always MT21 no matter what
* the input format is.
* @IPI_VDEC_VP8: The interrupt from is to notify kernel to
* handle VP8 video decoder job, and vice versa.
* Decode output format is always MT21 no matter what
* the input format is.
* @IPI_VDEC_VP9: The interrupt from vpu is to notify kernel to
* handle VP9 video decoder job, and vice versa.
* Decode output format is always MT21 no matter what
* the input format is.
* @IPI_VENC_H264: The interrupt from vpu is to notify kernel to * @IPI_VENC_H264: The interrupt from vpu is to notify kernel to
handle H264 video encoder job, and vice versa. * handle H264 video encoder job, and vice versa.
* @IPI_VENC_VP8: The interrupt fro vpu is to notify kernel to * @IPI_VENC_VP8: The interrupt fro vpu is to notify kernel to
handle VP8 video encoder job,, and vice versa. * handle VP8 video encoder job,, and vice versa.
* @IPI_MAX: The maximum IPI number * @IPI_MAX: The maximum IPI number
*/ */
enum ipi_id { enum ipi_id {
IPI_VPU_INIT = 0, IPI_VPU_INIT = 0,
IPI_VDEC_H264,
IPI_VDEC_VP8,
IPI_VDEC_VP9,
IPI_VENC_H264, IPI_VENC_H264,
IPI_VENC_VP8, IPI_VENC_VP8,
IPI_MAX, IPI_MAX,
@ -55,10 +70,12 @@ enum ipi_id {
* enum rst_id - reset id to register reset function for VPU watchdog timeout * enum rst_id - reset id to register reset function for VPU watchdog timeout
* *
* @VPU_RST_ENC: encoder reset id * @VPU_RST_ENC: encoder reset id
* @VPU_RST_DEC: decoder reset id
* @VPU_RST_MAX: maximum reset id * @VPU_RST_MAX: maximum reset id
*/ */
enum rst_id { enum rst_id {
VPU_RST_ENC, VPU_RST_ENC,
VPU_RST_DEC,
VPU_RST_MAX, VPU_RST_MAX,
}; };
@ -125,6 +142,16 @@ struct platform_device *vpu_get_plat_device(struct platform_device *pdev);
int vpu_wdt_reg_handler(struct platform_device *pdev, int vpu_wdt_reg_handler(struct platform_device *pdev,
void vpu_wdt_reset_func(void *), void vpu_wdt_reset_func(void *),
void *priv, enum rst_id id); void *priv, enum rst_id id);
/**
* vpu_get_vdec_hw_capa - get video decoder hardware capability
*
* @pdev: VPU platform device
*
* Return: video decoder hardware capability
**/
unsigned int vpu_get_vdec_hw_capa(struct platform_device *pdev);
/** /**
* vpu_get_venc_hw_capa - get video encoder hardware capability * vpu_get_venc_hw_capa - get video encoder hardware capability
* *