projects
/
linux-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
318462d
)
drm/mediatek: distinguish ovl and ovl_2l by layer_nr
author
Yongqiang Niu
<yongqiang.niu@mediatek.com>
Thu, 29 Aug 2019 14:50:45 +0000
(22:50 +0800)
committer
CK Hu
<ck.hu@mediatek.com>
Wed, 9 Oct 2019 08:58:12 +0000
(16:58 +0800)
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>
drivers/gpu/drm/mediatek/mtk_disp_ovl.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
index 7a87196cb570c81f69926fa891bd627ed9b0f2e0..14878ebf59d7af80de4b982148d258ac92196d63 100644
(file)
--- 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,