Commit 0a2f03bb authored by kyrie wu's avatar kyrie wu Committed by Mauro Carvalho Chehab

media: mtk-jpeg: refactor hw dev initializaiton

Add a atomic_t variable for initialization of hw dev.
Signed-off-by: default avatarkyrie wu <kyrie.wu@mediatek.com>
Signed-off-by: default avatarirui wang <irui.wang@mediatek.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 09aea13e
...@@ -1742,6 +1742,7 @@ static int mtk_jpeg_probe(struct platform_device *pdev) ...@@ -1742,6 +1742,7 @@ static int mtk_jpeg_probe(struct platform_device *pdev)
num_child++; num_child++;
atomic_set(&jpeg->hw_rdy, num_child); atomic_set(&jpeg->hw_rdy, num_child);
atomic_set(&jpeg->hw_index, 0);
jpeg->workqueue = alloc_ordered_workqueue(MTK_JPEG_NAME, jpeg->workqueue = alloc_ordered_workqueue(MTK_JPEG_NAME,
WQ_MEM_RECLAIM WQ_MEM_RECLAIM
......
...@@ -208,6 +208,7 @@ struct mtk_jpegdec_comp_dev { ...@@ -208,6 +208,7 @@ struct mtk_jpegdec_comp_dev {
* @hw_rdy: jpg hw ready flag * @hw_rdy: jpg hw ready flag
* @reg_decbase: jpg decode register base addr * @reg_decbase: jpg decode register base addr
* @dec_hw_dev: jpg decode hardware device * @dec_hw_dev: jpg decode hardware device
* @hw_index: jpg hw index
*/ */
struct mtk_jpeg_dev { struct mtk_jpeg_dev {
struct mutex lock; struct mutex lock;
...@@ -229,6 +230,7 @@ struct mtk_jpeg_dev { ...@@ -229,6 +230,7 @@ struct mtk_jpeg_dev {
void __iomem *reg_decbase[MTK_JPEGDEC_HW_MAX]; void __iomem *reg_decbase[MTK_JPEGDEC_HW_MAX];
struct mtk_jpegdec_comp_dev *dec_hw_dev[MTK_JPEGDEC_HW_MAX]; struct mtk_jpegdec_comp_dev *dec_hw_dev[MTK_JPEGDEC_HW_MAX];
atomic_t hw_index;
}; };
/** /**
......
...@@ -638,14 +638,10 @@ static int mtk_jpegdec_hw_probe(struct platform_device *pdev) ...@@ -638,14 +638,10 @@ static int mtk_jpegdec_hw_probe(struct platform_device *pdev)
return dev_err_probe(&pdev->dev, ret, return dev_err_probe(&pdev->dev, ret,
"Failed to register JPEGDEC irq handler.\n"); "Failed to register JPEGDEC irq handler.\n");
for (i = 0; i < MTK_JPEGDEC_HW_MAX; i++) { i = atomic_add_return(1, &master_dev->hw_index) - 1;
if (master_dev->dec_hw_dev[i])
continue;
master_dev->dec_hw_dev[i] = dev; master_dev->dec_hw_dev[i] = dev;
master_dev->reg_decbase[i] = dev->reg_base; master_dev->reg_decbase[i] = dev->reg_base;
dev->master_dev = master_dev; dev->master_dev = master_dev;
}
platform_set_drvdata(pdev, dev); platform_set_drvdata(pdev, dev);
pm_runtime_enable(&pdev->dev); pm_runtime_enable(&pdev->dev);
......
...@@ -362,14 +362,10 @@ static int mtk_jpegenc_hw_probe(struct platform_device *pdev) ...@@ -362,14 +362,10 @@ static int mtk_jpegenc_hw_probe(struct platform_device *pdev)
if (ret) if (ret)
return ret; return ret;
for (i = 0; i < MTK_JPEGENC_HW_MAX; i++) { i = atomic_add_return(1, &master_dev->hw_index) - 1;
if (master_dev->enc_hw_dev[i])
continue;
master_dev->enc_hw_dev[i] = dev; master_dev->enc_hw_dev[i] = dev;
master_dev->reg_encbase[i] = dev->reg_base; master_dev->reg_encbase[i] = dev->reg_base;
dev->master_dev = master_dev; dev->master_dev = master_dev;
}
platform_set_drvdata(pdev, dev); platform_set_drvdata(pdev, dev);
pm_runtime_enable(&pdev->dev); pm_runtime_enable(&pdev->dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment