mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

media: mtk-jpeg: refactor hw dev initializaiton 

Add a atomic_t variable for initialization of hw dev.

Signed-off-by: kyrie wu <kyrie.wu@mediatek.com>
Signed-off-by: irui wang <irui.wang@mediatek.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
kyrie wu 2023-03-10 06:23:55 +00:00 committed by Mauro Carvalho Chehab
parent 09aea13ecf
commit 0a2f03bbdc
4 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
View File

@ -1742,6 +1742,7 @@ static int mtk_jpeg_probe(struct platform_device *pdev)
num_child++;
atomic_set(&jpeg->hw_rdy, num_child);
atomic_set(&jpeg->hw_index, 0);
jpeg->workqueue = alloc_ordered_workqueue(MTK_JPEG_NAME,
WQ_MEM_RECLAIM

2
drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h
View File

@ -208,6 +208,7 @@ struct mtk_jpegdec_comp_dev {
* @hw_rdy: jpg hw ready flag
* @reg_decbase: jpg decode register base addr
* @dec_hw_dev: jpg decode hardware device
* @hw_index: jpg hw index
*/
struct mtk_jpeg_dev {
struct mutex lock;
@ -229,6 +230,7 @@ struct mtk_jpeg_dev {
void __iomem *reg_decbase[MTK_JPEGDEC_HW_MAX];
struct mtk_jpegdec_comp_dev *dec_hw_dev[MTK_JPEGDEC_HW_MAX];
atomic_t hw_index;
};
/**

12
drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c
View File

@ -638,14 +638,10 @@ static int mtk_jpegdec_hw_probe(struct platform_device *pdev)
return dev_err_probe(&pdev->dev, ret,
"Failed to register JPEGDEC irq handler.\n");
for (i = 0; i < MTK_JPEGDEC_HW_MAX; i++) {
if (master_dev->dec_hw_dev[i])
continue;
master_dev->dec_hw_dev[i] = dev;
master_dev->reg_decbase[i] = dev->reg_base;
dev->master_dev = master_dev;
}
i = atomic_add_return(1, &master_dev->hw_index) - 1;
master_dev->dec_hw_dev[i] = dev;
master_dev->reg_decbase[i] = dev->reg_base;
dev->master_dev = master_dev;
platform_set_drvdata(pdev, dev);
pm_runtime_enable(&pdev->dev);

12
drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c
View File

@ -362,14 +362,10 @@ static int mtk_jpegenc_hw_probe(struct platform_device *pdev)
if (ret)
return ret;
for (i = 0; i < MTK_JPEGENC_HW_MAX; i++) {
if (master_dev->enc_hw_dev[i])
continue;
master_dev->enc_hw_dev[i] = dev;
master_dev->reg_encbase[i] = dev->reg_base;
dev->master_dev = master_dev;
}
i = atomic_add_return(1, &master_dev->hw_index) - 1;
master_dev->enc_hw_dev[i] = dev;
master_dev->reg_encbase[i] = dev->reg_base;
dev->master_dev = master_dev;
platform_set_drvdata(pdev, dev);
pm_runtime_enable(&pdev->dev);