diff options
author | Yongqiang Niu <yongqiang.niu@mediatek.com> | 2019-08-29 22:50:45 +0800 |
---|---|---|
committer | CK Hu <ck.hu@mediatek.com> | 2019-10-09 16:58:12 +0800 |
commit | 57148baac8b78461e394953cfd5317bde8f795ab (patch) | |
tree | 5d9f8325910af447e10be3705502500d58010c0f /drivers/gpu/drm/mediatek/mtk_disp_ovl.c | |
parent | 318462d1a568634ba09263cc730cb0fb1d56c2b3 (diff) | |
download | linux-57148baac8b78461e394953cfd5317bde8f795ab.tar.gz linux-57148baac8b78461e394953cfd5317bde8f795ab.tar.bz2 linux-57148baac8b78461e394953cfd5317bde8f795ab.zip |
drm/mediatek: distinguish ovl and ovl_2l by layer_nr
distinguish ovl and ovl_2l by layer_nr when get comp
id
Signed-off-by: Yongqiang Niu <yongqiang.niu@mediatek.com>
Signed-off-by: CK Hu <ck.hu@mediatek.com>
Diffstat (limited to 'drivers/gpu/drm/mediatek/mtk_disp_ovl.c')
-rw-r--r-- | drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c index 7a87196cb570..14878ebf59d7 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c @@ -318,7 +318,12 @@ static int mtk_disp_ovl_probe(struct platform_device *pdev) if (irq < 0) return irq; - comp_id = mtk_ddp_comp_get_id(dev->of_node, MTK_DISP_OVL); + priv->data = of_device_get_match_data(dev); + + comp_id = mtk_ddp_comp_get_id(dev->of_node, + priv->data->layer_nr == 4 ? + MTK_DISP_OVL : + MTK_DISP_OVL_2L); if (comp_id < 0) { dev_err(dev, "Failed to identify by alias: %d\n", comp_id); return comp_id; @@ -331,8 +336,6 @@ static int mtk_disp_ovl_probe(struct platform_device *pdev) return ret; } - priv->data = of_device_get_match_data(dev); - platform_set_drvdata(pdev, priv); ret = devm_request_irq(dev, irq, mtk_disp_ovl_irq_handler, |