Skip to contentSkip to conversation

Revert "drm/mediatek: fix a typo of OD_CFG to OD_RELAYMODE"

PATCH New Arnd Bergmann 1 participant 2 messages Nov 17, 2016

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

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

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.

---
 drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +1 -1
index aa5f20f..df33b3c 100644
@@ -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);
 }
 
Signature · 6 lines
2.9.0

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#1 lore raw

PATCH 2/2 Revert "drm/mediatek: set vblank_disable_allowed to true"

This reverts commit f752fff611b ("drm/mediatek: set vblank_disable_allowed to true"), which no longer applies to mainline kernels and instead results in a build failure:

drivers/gpu/drm/mediatek/mtk_drm_drv.c:220:5: error: 'struct drm_device' has no member named 'vblank_disable_allowed'

The 'vblank_disable_allowed' member was removed in commit ee59065e58 ("drm: Nuke ->vblank_disable_allowed") for v4.7.

---
 drivers/gpu/drm/mediatek/mtk_drm_drv.c | 1 -
 1 file changed, 1 deletion(-)
drivers/gpu/drm/mediatek/mtk_drm_drv.c +0 -1
index 0b2ae47..cf83f65 100644
@@ -217,7 +217,6 @@ static int mtk_drm_kms_init(struct drm_device *drm)
 	if (ret < 0)
 		goto err_component_unbind;
 
-	drm->vblank_disable_allowed = true;
 	drm_kms_helper_poll_init(drm);
 	drm_mode_config_reset(drm);
 
Signature · 6 lines
2.9.0

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel