[PATCH 1/2] Revert "drm/mediatek: fix a typo of OD_CFG to OD_RELAYMODE"

Arnd Bergmann arnd at arndb.de
Thu Nov 17 14:58:08 UTC 2016


This reverts commit 83ba62bc700ba ("drm/mediatek: fix a typo of OD_CFG
to OD_RELAYMODE"), which causes a build failure:

drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c:126:36: error: 'OD_CFG' undeclared (first use in this function)

It currently applies on neither v4.9-rc nor today's linux-next
as the OD_CFG macro is not defined anywhere.

Signed-off-by: Arnd Bergmann <arnd at arndb.de>
---
 drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
index aa5f20f..df33b3c 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
@@ -123,7 +123,7 @@ static void mtk_od_config(struct mtk_ddp_comp *comp, unsigned int w,
 			  unsigned int bpc)
 {
 	writel(w << 16 | h, comp->regs + DISP_OD_SIZE);
-	writel(OD_RELAYMODE, comp->regs + OD_CFG);
+	writel(OD_RELAYMODE, comp->regs + OD_RELAYMODE);
 	mtk_dither_set(comp, bpc, DISP_OD_CFG);
 }
 
-- 
2.9.0



More information about the dri-devel mailing list