Skip to content

Commit

Permalink
media: mtk-mdp: convert mtk_mdp_dev.comp array to list
Browse files Browse the repository at this point in the history 
The functions mtk_mdp_register/unregister_component have been created to
add / remove items from the list of components.

This will eventually enable us to specify a list of components in the
device tree instead of hardcoding them into this driver.

The list is modified by a single thread at driver probe time, and will
not be traversed by another thread until the call to pm_runtime_enable
at the end of probing.

Signed-off-by: Eizan Miyamoto <eizan@chromium.org>
Reviewed-by: Enric Balletbo I Serra <enric.balletbo@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
  • Loading branch information
@mchehab
Eizan Miyamoto authored and mchehab committed Jul 4, 2020
1 parent ee18fc7 commit 86698b9
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 16 deletions.
1 change: 1 addition & 0 deletions drivers/media/platform/mtk-mdp/mtk_mdp_comp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ int mtk_mdp_comp_init(struct device *dev, struct device_node *node,
return -EINVAL;
}

INIT_LIST_HEAD(&comp->node);
comp->dev_node = of_node_get(node);
comp->id = comp_id;
comp->type = mtk_mdp_matches[comp_id].type;
Expand Down
2 changes: 2 additions & 0 deletions drivers/media/platform/mtk-mdp/mtk_mdp_comp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,15 @@ enum mtk_mdp_comp_id {

/**
* struct mtk_mdp_comp - the MDP's function component data
* @node: list node to track sibing MDP components
* @dev_node: component device node
* @clk: clocks required for component
* @larb_dev: SMI device required for component
* @type: component type
* @id: component ID
*/
struct mtk_mdp_comp {
struct list_head node;
struct device_node *dev_node;
struct clk *clk[2];
struct device *larb_dev;
Expand Down
46 changes: 32 additions & 14 deletions drivers/media/platform/mtk-mdp/mtk_mdp_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,19 +55,19 @@ MODULE_DEVICE_TABLE(of, mtk_mdp_of_ids);
static void mtk_mdp_clock_on(struct mtk_mdp_dev *mdp)
{
struct device *dev = &mdp->pdev->dev;
int i;
struct mtk_mdp_comp *comp_node;

for (i = 0; i < ARRAY_SIZE(mdp->comp); i++)
mtk_mdp_comp_clock_on(dev, mdp->comp[i]);
list_for_each_entry(comp_node, &mdp->comp_list, node)
mtk_mdp_comp_clock_on(dev, comp_node);
}

static void mtk_mdp_clock_off(struct mtk_mdp_dev *mdp)
{
struct device *dev = &mdp->pdev->dev;
int i;
struct mtk_mdp_comp *comp_node;

for (i = 0; i < ARRAY_SIZE(mdp->comp); i++)
mtk_mdp_comp_clock_off(dev, mdp->comp[i]);
list_for_each_entry(comp_node, &mdp->comp_list, node)
mtk_mdp_comp_clock_off(dev, comp_node);
}

static void mtk_mdp_wdt_worker(struct work_struct *work)
Expand All @@ -91,19 +91,33 @@ static void mtk_mdp_reset_handler(void *priv)
queue_work(mdp->wdt_wq, &mdp->wdt_work);
}

void mtk_mdp_register_component(struct mtk_mdp_dev *mdp,
struct mtk_mdp_comp *comp)
{
list_add(&mdp->comp_list, &comp->node);
}

void mtk_mdp_unregister_component(struct mtk_mdp_dev *mdp,
struct mtk_mdp_comp *comp)
{
list_del(&comp->node);
}

static int mtk_mdp_probe(struct platform_device *pdev)
{
struct mtk_mdp_dev *mdp;
struct device *dev = &pdev->dev;
struct device_node *node, *parent;
int i, ret = 0;
struct mtk_mdp_comp *comp, *comp_temp;
int ret = 0;

mdp = devm_kzalloc(dev, sizeof(*mdp), GFP_KERNEL);
if (!mdp)
return -ENOMEM;

mdp->id = pdev->id;
mdp->pdev = pdev;
INIT_LIST_HEAD(&mdp->comp_list);
INIT_LIST_HEAD(&mdp->ctx_list);

mutex_init(&mdp->lock);
Expand All @@ -124,7 +138,6 @@ static int mtk_mdp_probe(struct platform_device *pdev)
const struct of_device_id *of_id;
enum mtk_mdp_comp_type comp_type;
int comp_id;
struct mtk_mdp_comp *comp;

of_id = of_match_node(mtk_mdp_comp_dt_ids, node);
if (!of_id)
Expand All @@ -150,13 +163,14 @@ static int mtk_mdp_probe(struct platform_device *pdev)
of_node_put(node);
goto err_comp;
}
mdp->comp[comp_id] = comp;

ret = mtk_mdp_comp_init(dev, node, comp, comp_id);
if (ret) {
of_node_put(node);
goto err_comp;
}

mtk_mdp_register_component(mdp, comp);
}

mdp->job_wq = create_singlethread_workqueue(MTK_MDP_MODULE_NAME);
Expand Down Expand Up @@ -220,8 +234,10 @@ static int mtk_mdp_probe(struct platform_device *pdev)
err_alloc_job_wq:

err_comp:
for (i = 0; i < ARRAY_SIZE(mdp->comp); i++)
mtk_mdp_comp_deinit(dev, mdp->comp[i]);
list_for_each_entry_safe(comp, comp_temp, &mdp->comp_list, node) {
mtk_mdp_unregister_component(mdp, comp);
mtk_mdp_comp_deinit(dev, comp);
}

dev_dbg(dev, "err %d\n", ret);
return ret;
Expand All @@ -230,7 +246,7 @@ static int mtk_mdp_probe(struct platform_device *pdev)
static int mtk_mdp_remove(struct platform_device *pdev)
{
struct mtk_mdp_dev *mdp = platform_get_drvdata(pdev);
int i;
struct mtk_mdp_comp *comp, *comp_temp;

pm_runtime_disable(&pdev->dev);
vb2_dma_contig_clear_max_seg_size(&pdev->dev);
Expand All @@ -243,8 +259,10 @@ static int mtk_mdp_remove(struct platform_device *pdev)
flush_workqueue(mdp->job_wq);
destroy_workqueue(mdp->job_wq);

for (i = 0; i < ARRAY_SIZE(mdp->comp); i++)
mtk_mdp_comp_deinit(&pdev->dev, mdp->comp[i]);
list_for_each_entry_safe(comp, comp_temp, &mdp->comp_list, node) {
mtk_mdp_unregister_component(mdp, comp);
mtk_mdp_comp_deinit(&pdev->dev, comp);
}

dev_dbg(&pdev->dev, "%s driver unloaded\n", pdev->name);
return 0;
Expand Down
10 changes: 8 additions & 2 deletions drivers/media/platform/mtk-mdp/mtk_mdp_core.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ struct mtk_mdp_variant {
* @pdev: pointer to the image processor platform device
* @variant: the IP variant information
* @id: image processor device index (0..MTK_MDP_MAX_DEVS)
* @comp: MDP function components
* @comp_list: list of MDP function components
* @m2m_dev: v4l2 memory-to-memory device data
* @ctx_list: list of struct mtk_mdp_ctx
* @vdev: video device for image processor driver
Expand All @@ -154,7 +154,7 @@ struct mtk_mdp_dev {
struct platform_device *pdev;
struct mtk_mdp_variant *variant;
u16 id;
struct mtk_mdp_comp *comp[MTK_MDP_COMP_ID_MAX];
struct list_head comp_list;
struct v4l2_m2m_dev *m2m_dev;
struct list_head ctx_list;
struct video_device *vdev;
Expand Down Expand Up @@ -221,6 +221,12 @@ struct mtk_mdp_ctx {

extern int mtk_mdp_dbg_level;

void mtk_mdp_register_component(struct mtk_mdp_dev *mdp,
struct mtk_mdp_comp *comp);

void mtk_mdp_unregister_component(struct mtk_mdp_dev *mdp,
struct mtk_mdp_comp *comp);

#if defined(DEBUG)

#define mtk_mdp_dbg(level, fmt, args...) \
Expand Down

0 comments on commit 86698b9

Please sign in to comment.