Skip to content

Commit aa0ee7b

Browse files
YongWu-HFjoergroedel
authored andcommitted
media: mediatek: vcodec: Remove the setting for dma_mask
In order to simplify the masters to set their respective dma masks, MTK IOMMU helps to centralize the processing. Because all the dma ranges is set in IOMMU, IOMMU knows well the dma mask requirements of masters. After this patch, the masters(codec here) code does not need care dma-ranges/dma_mask related information. Cc: Tiffany Lin <tiffany.lin@mediatek.com> Cc: Andrew-CT Chen <andrew-ct.chen@mediatek.com> Cc: Yunfei Dong <yunfei.dong@mediatek.com> Cc: Mauro Carvalho Chehab <mchehab@kernel.org> Cc: irui wang <irui.wang@mediatek.com> Signed-off-by: Yong Wu <yong.wu@mediatek.com> Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Link: https://lore.kernel.org/r/20230411093144.2690-12-yong.wu@mediatek.com Signed-off-by: Joerg Roedel <jroedel@suse.de>
1 parent 7d35584 commit aa0ee7b

2 files changed

Lines changed: 0 additions & 11 deletions

File tree

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -321,14 +321,6 @@ static int mtk_vcodec_probe(struct platform_device *pdev)
321321
}
322322
}
323323

324-
if (of_get_property(pdev->dev.of_node, "dma-ranges", NULL)) {
325-
ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(34));
326-
if (ret) {
327-
mtk_v4l2_err("Failed to set mask");
328-
goto err_core_workq;
329-
}
330-
}
331-
332324
for (i = 0; i < MTK_VDEC_HW_MAX; i++)
333325
mutex_init(&dev->dec_mutex[i]);
334326
mutex_init(&dev->dev_mutex);

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -344,9 +344,6 @@ static int mtk_vcodec_probe(struct platform_device *pdev)
344344
goto err_event_workq;
345345
}
346346

347-
if (of_get_property(pdev->dev.of_node, "dma-ranges", NULL))
348-
dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(34));
349-
350347
ret = video_register_device(vfd_enc, VFL_TYPE_VIDEO, -1);
351348
if (ret) {
352349
mtk_v4l2_err("Failed to register video device");

0 commit comments

Comments
 (0)