Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

media: drm/mediatek: Get rid of mtk_smi_larb_get/put

MediaTek IOMMU has already added the device_link between the consumer
and smi-larb device. If the drm device calls the pm_runtime_get_sync,
the smi-larb's pm_runtime_get_sync also be called automatically.

CC: CK Hu <ck.hu@mediatek.com>
CC: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
Reviewed-by: Evan Green <evgreen@chromium.org>
Acked-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Reviewed-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
Tested-by: Frank Wunderlich <frank-w@public-files.de> # BPI-R2/MT7623
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

authored by

Yong Wu and committed by
Mauro Carvalho Chehab
ce6c24ba 5db12f5d

+3 -49
-10
drivers/gpu/drm/mediatek/mtk_drm_crtc.c
··· 12 12 #include <linux/soc/mediatek/mtk-mutex.h> 13 13 14 14 #include <asm/barrier.h> 15 - #include <soc/mediatek/smi.h> 16 15 17 16 #include <drm/drm_atomic.h> 18 17 #include <drm/drm_atomic_helper.h> ··· 660 661 661 662 DRM_DEBUG_DRIVER("%s %d\n", __func__, crtc->base.id); 662 663 663 - ret = mtk_smi_larb_get(comp->larb_dev); 664 - if (ret) { 665 - DRM_ERROR("Failed to get larb: %d\n", ret); 666 - return; 667 - } 668 - 669 664 ret = pm_runtime_resume_and_get(comp->dev); 670 665 if (ret < 0) { 671 - mtk_smi_larb_put(comp->larb_dev); 672 666 DRM_DEV_ERROR(comp->dev, "Failed to enable power domain: %d\n", ret); 673 667 return; 674 668 } 675 669 676 670 ret = mtk_crtc_ddp_hw_init(mtk_crtc); 677 671 if (ret) { 678 - mtk_smi_larb_put(comp->larb_dev); 679 672 pm_runtime_put(comp->dev); 680 673 return; 681 674 } ··· 704 713 705 714 drm_crtc_vblank_off(crtc); 706 715 mtk_crtc_ddp_hw_fini(mtk_crtc); 707 - mtk_smi_larb_put(comp->larb_dev); 708 716 ret = pm_runtime_put(comp->dev); 709 717 if (ret < 0) 710 718 DRM_DEV_ERROR(comp->dev, "Failed to disable power domain: %d\n", ret);
+2 -34
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
··· 447 447 return ret; 448 448 } 449 449 450 - static int mtk_ddp_get_larb_dev(struct device_node *node, struct mtk_ddp_comp *comp, 451 - struct device *dev) 452 - { 453 - struct device_node *larb_node; 454 - struct platform_device *larb_pdev; 455 - 456 - larb_node = of_parse_phandle(node, "mediatek,larb", 0); 457 - if (!larb_node) { 458 - dev_err(dev, "Missing mediadek,larb phandle in %pOF node\n", node); 459 - return -EINVAL; 460 - } 461 - 462 - larb_pdev = of_find_device_by_node(larb_node); 463 - if (!larb_pdev) { 464 - dev_warn(dev, "Waiting for larb device %pOF\n", larb_node); 465 - of_node_put(larb_node); 466 - return -EPROBE_DEFER; 467 - } 468 - of_node_put(larb_node); 469 - comp->larb_dev = &larb_pdev->dev; 470 - 471 - return 0; 472 - } 473 - 474 450 int mtk_ddp_comp_init(struct device_node *node, struct mtk_ddp_comp *comp, 475 451 enum mtk_ddp_comp_id comp_id) 476 452 { 477 453 struct platform_device *comp_pdev; 478 454 enum mtk_ddp_comp_type type; 479 455 struct mtk_ddp_comp_dev *priv; 456 + #if IS_REACHABLE(CONFIG_MTK_CMDQ) 480 457 int ret; 458 + #endif 481 459 482 460 if (comp_id < 0 || comp_id >= DDP_COMPONENT_ID_MAX) 483 461 return -EINVAL; ··· 470 492 return -EPROBE_DEFER; 471 493 } 472 494 comp->dev = &comp_pdev->dev; 473 - 474 - /* Only DMA capable components need the LARB property */ 475 - if (type == MTK_DISP_OVL || 476 - type == MTK_DISP_OVL_2L || 477 - type == MTK_DISP_RDMA || 478 - type == MTK_DISP_WDMA) { 479 - ret = mtk_ddp_get_larb_dev(node, comp, comp->dev); 480 - if (ret) 481 - return ret; 482 - } 483 495 484 496 if (type == MTK_DISP_AAL || 485 497 type == MTK_DISP_BLS ||
-1
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
··· 71 71 struct mtk_ddp_comp { 72 72 struct device *dev; 73 73 int irq; 74 - struct device *larb_dev; 75 74 enum mtk_ddp_comp_id id; 76 75 const struct mtk_ddp_comp_funcs *funcs; 77 76 };
+1 -4
drivers/gpu/drm/mediatek/mtk_drm_drv.c
··· 645 645 pm_runtime_disable(dev); 646 646 err_node: 647 647 of_node_put(private->mutex_node); 648 - for (i = 0; i < DDP_COMPONENT_ID_MAX; i++) { 648 + for (i = 0; i < DDP_COMPONENT_ID_MAX; i++) 649 649 of_node_put(private->comp_node[i]); 650 - if (private->ddp_comp[i].larb_dev) 651 - put_device(private->ddp_comp[i].larb_dev); 652 - } 653 650 return ret; 654 651 } 655 652