* [PATCH 1/2] Revert "drm/mediatek: fix a typo of OD_CFG to OD_RELAYMODE"
@ 2016-11-17 14:58 ` Arnd Bergmann
0 siblings, 0 replies; 4+ messages in thread
From: Arnd Bergmann @ 2016-11-17 14:58 UTC (permalink / raw)
To: Dave Airlie
Cc: linux-kernel, dri-devel, Philipp Zabel, Hu, Bibby Hsieh, Arnd Bergmann
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@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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 1/2] Revert "drm/mediatek: fix a typo of OD_CFG to OD_RELAYMODE"
@ 2016-11-17 14:58 ` Arnd Bergmann
0 siblings, 0 replies; 4+ messages in thread
From: Arnd Bergmann @ 2016-11-17 14:58 UTC (permalink / raw)
To: Dave Airlie; +Cc: Arnd Bergmann, linux-kernel, dri-devel
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@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
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] Revert "drm/mediatek: set vblank_disable_allowed to true"
2016-11-17 14:58 ` Arnd Bergmann
@ 2016-11-17 14:58 ` Arnd Bergmann
-1 siblings, 0 replies; 4+ messages in thread
From: Arnd Bergmann @ 2016-11-17 14:58 UTC (permalink / raw)
To: Dave Airlie
Cc: linux-kernel, dri-devel, Philipp Zabel, Hu, Bibby Hsieh, Arnd Bergmann
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.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/gpu/drm/mediatek/mtk_drm_drv.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
index 0b2ae47..cf83f65 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -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);
--
2.9.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] Revert "drm/mediatek: set vblank_disable_allowed to true"
@ 2016-11-17 14:58 ` Arnd Bergmann
0 siblings, 0 replies; 4+ messages in thread
From: Arnd Bergmann @ 2016-11-17 14:58 UTC (permalink / raw)
To: Dave Airlie; +Cc: Arnd Bergmann, linux-kernel, dri-devel
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.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/gpu/drm/mediatek/mtk_drm_drv.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
index 0b2ae47..cf83f65 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -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);
--
2.9.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-11-17 17:45 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-11-17 14:58 [PATCH 1/2] Revert "drm/mediatek: fix a typo of OD_CFG to OD_RELAYMODE" Arnd Bergmann
2016-11-17 14:58 ` Arnd Bergmann
2016-11-17 14:58 ` [PATCH 2/2] Revert "drm/mediatek: set vblank_disable_allowed to true" Arnd Bergmann
2016-11-17 14:58 ` Arnd Bergmann
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.