Commit 31272a39 authored by Yunfei Dong's avatar Yunfei Dong Committed by Mauro Carvalho Chehab
Browse files

media: mediatek: vcodec: separate struct mtk_vcodec_dev 



Adding different dev struct for encoder and decoder, remove
'struct mtk_vcodec_dev'.

Signed-off-by: default avatarYunfei Dong <yunfei.dong@mediatek.com>
Reviewed-by: default avatarNicolas Dufresne <nicolas.dufresne@collabora.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 01abf5fb

drivers/media/platform/mediatek/vcodec/mtk_vcodec_cmn_drv.h

+71 −0
Original line number Diff line number Diff line
@@ -17,6 +17,77 @@ 


#define MTK_VCODEC_MAX_PLANES	3



#define WAIT_INTR_TIMEOUT_MS	1000



/*

 * enum mtk_q_type - Type of queue

 */

enum mtk_q_type {

	MTK_Q_DATA_SRC = 0,

	MTK_Q_DATA_DST = 1,

};



/*

 * enum mtk_hw_reg_idx - MTK hw register base index

 */

enum mtk_hw_reg_idx {

	VDEC_SYS,

	VDEC_MISC,

	VDEC_LD,

	VDEC_TOP,

	VDEC_CM,

	VDEC_AD,

	VDEC_AV,

	VDEC_PP,

	VDEC_HWD,

	VDEC_HWQ,

	VDEC_HWB,

	VDEC_HWG,

	NUM_MAX_VDEC_REG_BASE,

	/* h264 encoder */

	VENC_SYS = NUM_MAX_VDEC_REG_BASE,

	/* vp8 encoder */

	VENC_LT_SYS,

	NUM_MAX_VCODEC_REG_BASE

};



/*

 * struct mtk_vcodec_clk_info - Structure used to store clock name

 */

struct mtk_vcodec_clk_info {

	const char	*clk_name;

	struct clk	*vcodec_clk;

};



/*

 * struct mtk_vcodec_clk - Structure used to store vcodec clock information

 */

struct mtk_vcodec_clk {

	struct mtk_vcodec_clk_info	*clk_info;

	int	clk_num;

};



/*

 * struct mtk_vcodec_pm - Power management data structure

 */

struct mtk_vcodec_pm {

	struct mtk_vcodec_clk	vdec_clk;

	struct mtk_vcodec_clk	venc_clk;

	struct device	*dev;

};



/*

 * enum mtk_vdec_hw_id - Hardware index used to separate

 *                         different hardware

 */

enum mtk_vdec_hw_id {

	MTK_VDEC_CORE,

	MTK_VDEC_LAT0,

	MTK_VDEC_LAT1,

	MTK_VDEC_LAT_SOC,

	MTK_VDEC_HW_MAX,

};



/**

 * enum mtk_instance_state - The state of an MTK Vcodec instance.

 * @MTK_STATE_FREE: default state when instance is created

drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.c

+34 −15
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ 
#include <linux/debugfs.h>



#include "mtk_vcodec_dbgfs.h"

#include "mtk_vcodec_drv.h"

#include "mtk_vcodec_dec_drv.h"

#include "mtk_vcodec_enc_drv.h"

#include "mtk_vcodec_util.h"



static void mtk_vdec_dbgfs_get_format_type(struct mtk_vcodec_dec_ctx *ctx, char *buf,
@@ -72,7 +73,7 @@ static void mtk_vdec_dbgfs_get_help(char *buf, int *used, int total) 
static ssize_t mtk_vdec_dbgfs_write(struct file *filp, const char __user *ubuf,

				    size_t count, loff_t *ppos)

{

	struct mtk_vcodec_dev *vcodec_dev = filp->private_data;

	struct mtk_vcodec_dec_dev *vcodec_dev = filp->private_data;

	struct mtk_vcodec_dbgfs *dbgfs = &vcodec_dev->dbgfs;



	mutex_lock(&dbgfs->dbgfs_lock);
@@ -88,7 +89,7 @@ static ssize_t mtk_vdec_dbgfs_write(struct file *filp, const char __user *ubuf, 
static ssize_t mtk_vdec_dbgfs_read(struct file *filp, char __user *ubuf,

				   size_t count, loff_t *ppos)

{

	struct mtk_vcodec_dev *vcodec_dev = filp->private_data;

	struct mtk_vcodec_dec_dev *vcodec_dev = filp->private_data;

	struct mtk_vcodec_dbgfs *dbgfs = &vcodec_dev->dbgfs;

	struct mtk_vcodec_dbgfs_inst *dbgfs_inst;

	struct mtk_vcodec_dec_ctx *ctx;
@@ -146,7 +147,7 @@ static const struct file_operations vdec_fops = { 
void mtk_vcodec_dbgfs_create(struct mtk_vcodec_dec_ctx *ctx)

{

	struct mtk_vcodec_dbgfs_inst *dbgfs_inst;

	struct mtk_vcodec_dev *vcodec_dev = ctx->dev;

	struct mtk_vcodec_dec_dev *vcodec_dev = ctx->dev;



	dbgfs_inst = kzalloc(sizeof(*dbgfs_inst), GFP_KERNEL);

	if (!dbgfs_inst)
@@ -161,7 +162,7 @@ void mtk_vcodec_dbgfs_create(struct mtk_vcodec_dec_ctx *ctx) 
}

EXPORT_SYMBOL_GPL(mtk_vcodec_dbgfs_create);



void mtk_vcodec_dbgfs_remove(struct mtk_vcodec_dev *vcodec_dev, int ctx_id)

void mtk_vcodec_dbgfs_remove(struct mtk_vcodec_dec_dev *vcodec_dev, int ctx_id)

{

	struct mtk_vcodec_dbgfs_inst *dbgfs_inst;
@@ -176,13 +177,10 @@ void mtk_vcodec_dbgfs_remove(struct mtk_vcodec_dev *vcodec_dev, int ctx_id) 
}

EXPORT_SYMBOL_GPL(mtk_vcodec_dbgfs_remove);



void mtk_vcodec_dbgfs_init(struct mtk_vcodec_dev *vcodec_dev, bool is_encode)

static void mtk_vcodec_dbgfs_vdec_init(struct mtk_vcodec_dec_dev *vcodec_dev)

{

	struct dentry *vcodec_root;



	if (is_encode)

		vcodec_dev->dbgfs.vcodec_root = debugfs_create_dir("vcodec-enc", NULL);

	else

	vcodec_dev->dbgfs.vcodec_root = debugfs_create_dir("vcodec-dec", NULL);

	if (IS_ERR(vcodec_dev->dbgfs.vcodec_root))

		dev_err(&vcodec_dev->plat_dev->dev, "create vcodec dir err:%ld\n",
@@ -193,18 +191,39 @@ void mtk_vcodec_dbgfs_init(struct mtk_vcodec_dev *vcodec_dev, bool is_encode) 
	debugfs_create_x32("mtk_vcodec_dbg", 0644, vcodec_root, &mtk_vcodec_dbg);



	vcodec_dev->dbgfs.inst_count = 0;

	if (is_encode)

		return;



	INIT_LIST_HEAD(&vcodec_dev->dbgfs.dbgfs_head);

	debugfs_create_file("vdec", 0200, vcodec_root, vcodec_dev, &vdec_fops);

	mutex_init(&vcodec_dev->dbgfs.dbgfs_lock);

}



static void mtk_vcodec_dbgfs_venc_init(struct mtk_vcodec_enc_dev *vcodec_dev)

{

	struct dentry *vcodec_root;



	vcodec_dev->dbgfs.vcodec_root = debugfs_create_dir("vcodec-enc", NULL);

	if (IS_ERR(vcodec_dev->dbgfs.vcodec_root))

		dev_err(&vcodec_dev->plat_dev->dev, "create venc dir err:%d\n",

			IS_ERR(vcodec_dev->dbgfs.vcodec_root));



	vcodec_root = vcodec_dev->dbgfs.vcodec_root;

	debugfs_create_x32("mtk_v4l2_dbg_level", 0644, vcodec_root, &mtk_v4l2_dbg_level);

	debugfs_create_x32("mtk_vcodec_dbg", 0644, vcodec_root, &mtk_vcodec_dbg);



	vcodec_dev->dbgfs.inst_count = 0;

}



void mtk_vcodec_dbgfs_init(void *vcodec_dev, bool is_encode)

{

	if (is_encode)

		mtk_vcodec_dbgfs_venc_init(vcodec_dev);

	else

		mtk_vcodec_dbgfs_vdec_init(vcodec_dev);

}

EXPORT_SYMBOL_GPL(mtk_vcodec_dbgfs_init);



void mtk_vcodec_dbgfs_deinit(struct mtk_vcodec_dev *vcodec_dev)

void mtk_vcodec_dbgfs_deinit(struct mtk_vcodec_dbgfs *dbgfs)

{

	debugfs_remove_recursive(vcodec_dev->dbgfs.vcodec_root);

	debugfs_remove_recursive(dbgfs->vcodec_root);

}

EXPORT_SYMBOL_GPL(mtk_vcodec_dbgfs_deinit);

drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.h

+7 −7
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#ifndef __MTK_VCODEC_DBGFS_H__

#define __MTK_VCODEC_DBGFS_H__



struct mtk_vcodec_dev;

struct mtk_vcodec_dec_dev;

struct mtk_vcodec_dec_ctx;



/*
@@ -51,23 +51,23 @@ struct mtk_vcodec_dbgfs { 


#if defined(CONFIG_DEBUG_FS)

void mtk_vcodec_dbgfs_create(struct mtk_vcodec_dec_ctx *ctx);

void mtk_vcodec_dbgfs_remove(struct mtk_vcodec_dev *vcodec_dev, int ctx_id);

void mtk_vcodec_dbgfs_init(struct mtk_vcodec_dev *vcodec_dev, bool is_encode);

void mtk_vcodec_dbgfs_deinit(struct mtk_vcodec_dev *vcodec_dev);

void mtk_vcodec_dbgfs_remove(struct mtk_vcodec_dec_dev *vcodec_dev, int ctx_id);

void mtk_vcodec_dbgfs_init(void *vcodec_dev, bool is_encode);

void mtk_vcodec_dbgfs_deinit(struct mtk_vcodec_dbgfs *dbgfs);

#else

static inline void mtk_vcodec_dbgfs_create(struct mtk_vcodec_dec_ctx *ctx)

{

}



static inline void mtk_vcodec_dbgfs_remove(struct mtk_vcodec_dev *vcodec_dev, int ctx_id)

static inline void mtk_vcodec_dbgfs_remove(struct mtk_vcodec_dec_dev *vcodec_dev, int ctx_id)

{

}



static inline void mtk_vcodec_dbgfs_init(struct mtk_vcodec_dev *vcodec_dev, bool is_encode)

static inline void mtk_vcodec_dbgfs_init(void *vcodec_dev, bool is_encode)

{

}



static inline void mtk_vcodec_dbgfs_deinit(struct mtk_vcodec_dev *vcodec_dev)

static inline void mtk_vcodec_dbgfs_deinit(struct mtk_vcodec_dbgfs *dbgfs)

{

}

#endif

drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include <media/v4l2-mem2mem.h>

#include <media/videobuf2-dma-contig.h>



#include "mtk_vcodec_drv.h"

#include "mtk_vcodec_dec_drv.h"

#include "mtk_vcodec_dec.h"

#include "mtk_vcodec_intr.h"

#include "mtk_vcodec_util.h"
@@ -890,7 +890,7 @@ void vb2ops_vdec_stop_streaming(struct vb2_queue *q) 
static void m2mops_vdec_device_run(void *priv)

{

	struct mtk_vcodec_dec_ctx *ctx = priv;

	struct mtk_vcodec_dev *dev = ctx->dev;

	struct mtk_vcodec_dec_dev *dev = ctx->dev;



	queue_work(dev->decode_workqueue, &ctx->decode_work);

}

drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_drv.c

+10 −11
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <media/videobuf2-dma-contig.h>

#include <media/v4l2-device.h>



#include "mtk_vcodec_drv.h"

#include "mtk_vcodec_dec.h"

#include "mtk_vcodec_dec_hw.h"

#include "mtk_vcodec_dec_pm.h"
@@ -29,7 +28,7 @@ 
#include "mtk_vcodec_util.h"

#include "mtk_vcodec_fw.h"



static int mtk_vcodec_get_hw_count(struct mtk_vcodec_dec_ctx *ctx, struct mtk_vcodec_dev *dev)

static int mtk_vcodec_get_hw_count(struct mtk_vcodec_dec_ctx *ctx, struct mtk_vcodec_dec_dev *dev)

{

	switch (dev->vdec_pdata->hw_arch) {

	case MTK_VDEC_PURE_SINGLE_CORE:
@@ -42,7 +41,7 @@ static int mtk_vcodec_get_hw_count(struct mtk_vcodec_dec_ctx *ctx, struct mtk_vc 
	}

}



static bool mtk_vcodec_is_hw_active(struct mtk_vcodec_dev *dev)

static bool mtk_vcodec_is_hw_active(struct mtk_vcodec_dec_dev *dev)

{

	u32 cg_status;
@@ -56,7 +55,7 @@ static bool mtk_vcodec_is_hw_active(struct mtk_vcodec_dev *dev) 


static irqreturn_t mtk_vcodec_dec_irq_handler(int irq, void *priv)

{

	struct mtk_vcodec_dev *dev = priv;

	struct mtk_vcodec_dec_dev *dev = priv;

	struct mtk_vcodec_dec_ctx *ctx;

	unsigned int dec_done_status = 0;

	void __iomem *vdec_misc_addr = dev->reg_base[VDEC_MISC] +
@@ -88,7 +87,7 @@ static irqreturn_t mtk_vcodec_dec_irq_handler(int irq, void *priv) 
	return IRQ_HANDLED;

}



static int mtk_vcodec_get_reg_bases(struct mtk_vcodec_dev *dev)

static int mtk_vcodec_get_reg_bases(struct mtk_vcodec_dec_dev *dev)

{

	struct platform_device *pdev = dev->plat_dev;

	int reg_num, i;
@@ -160,7 +159,7 @@ static int mtk_vcodec_get_reg_bases(struct mtk_vcodec_dev *dev) 
	return 0;

}



static int mtk_vcodec_init_dec_resources(struct mtk_vcodec_dev *dev)

static int mtk_vcodec_init_dec_resources(struct mtk_vcodec_dec_dev *dev)

{

	struct platform_device *pdev = dev->plat_dev;

	int ret;
@@ -197,7 +196,7 @@ static int mtk_vcodec_init_dec_resources(struct mtk_vcodec_dev *dev) 


static int fops_vcodec_open(struct file *file)

{

	struct mtk_vcodec_dev *dev = video_drvdata(file);

	struct mtk_vcodec_dec_dev *dev = video_drvdata(file);

	struct mtk_vcodec_dec_ctx *ctx = NULL;

	int ret = 0, i, hw_count;

	struct vb2_queue *src_vq;
@@ -294,7 +293,7 @@ static int fops_vcodec_open(struct file *file) 


static int fops_vcodec_release(struct file *file)

{

	struct mtk_vcodec_dev *dev = video_drvdata(file);

	struct mtk_vcodec_dec_dev *dev = video_drvdata(file);

	struct mtk_vcodec_dec_ctx *ctx = fh_to_dec_ctx(file->private_data);



	mtk_v4l2_vdec_dbg(0, ctx, "[%d] decoder", ctx->id);
@@ -331,7 +330,7 @@ static const struct v4l2_file_operations mtk_vcodec_fops = { 


static int mtk_vcodec_probe(struct platform_device *pdev)

{

	struct mtk_vcodec_dev *dev;

	struct mtk_vcodec_dec_dev *dev;

	struct video_device *vfd_dec;

	phandle rproc_phandle;

	enum mtk_vcodec_fw_type fw_type;
@@ -538,7 +537,7 @@ MODULE_DEVICE_TABLE(of, mtk_vcodec_match); 


static void mtk_vcodec_dec_remove(struct platform_device *pdev)

{

	struct mtk_vcodec_dev *dev = platform_get_drvdata(pdev);

	struct mtk_vcodec_dec_dev *dev = platform_get_drvdata(pdev);



	destroy_workqueue(dev->decode_workqueue);
@@ -554,7 +553,7 @@ static void mtk_vcodec_dec_remove(struct platform_device *pdev) 
	if (dev->vfd_dec)

		video_unregister_device(dev->vfd_dec);



	mtk_vcodec_dbgfs_deinit(dev);

	mtk_vcodec_dbgfs_deinit(&dev->dbgfs);

	v4l2_device_unregister(&dev->v4l2_dev);

	if (!dev->vdec_pdata->is_subdev_supported)

		pm_runtime_disable(dev->pm.dev);