From patchwork Thu Nov 17 14:58:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101498 Delivered-To: patch@linaro.org Received: by 10.140.97.165 with SMTP id m34csp797827qge; Thu, 17 Nov 2016 06:59:07 -0800 (PST) X-Received: by 10.99.113.5 with SMTP id m5mr8787165pgc.34.1479394747513; Thu, 17 Nov 2016 06:59:07 -0800 (PST) Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id m1si3663560pge.100.2016.11.17.06.59.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Nov 2016 06:59:07 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 630176E073; Thu, 17 Nov 2016 14:58:36 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.73]) by gabe.freedesktop.org (Postfix) with ESMTPS id D0E006E073 for ; Thu, 17 Nov 2016 14:58:33 +0000 (UTC) Received: from wuerfel.lan ([78.43.21.235]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0LoZ6A-1cjE492KUM-00gUTT; Thu, 17 Nov 2016 15:58:19 +0100 From: Arnd Bergmann To: Dave Airlie Subject: [PATCH 1/2] Revert "drm/mediatek: fix a typo of OD_CFG to OD_RELAYMODE" Date: Thu, 17 Nov 2016 15:58:08 +0100 Message-Id: <20161117145809.4189126-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:OJiaQB94jEkewNLkS7hiZUfJHZZwFo3Dzvi1mFJoAw3O/Ndeg84 XporhIgg5vf+rBlZ/5hlMwhjQbjfuE8DfVB7WcxN8hslBogzq/i4bXm0dw1pgUj1bR5ivDq oXWSVvat/7fuz7U91IYPZeMAoEpAKvxwgya7/CF/WAErEL2yPUwbhDLnTwaQgvgEfhh+//B qk1r16eYDdy6ZTQQ3Ysrw== X-UI-Out-Filterresults: notjunk:1; V01:K0:6Ia/Dvj2jfw=:Lmfx5DQKjcFrRig0zAiYWD vgBvW0CRFo4GMTre+FvPbX3+w9gUNDzZaJchR25EoD4fvUkPiBKlc5YE2UvKO0vWVkm1HzDFa boIgdkLa/c7f/FxLefXats59dQnspEbjH4NAPiq4VFuJmvOEYTt/a3WiapFKCW2a7YQfd7l81 5SMwujID/iA3zXtKtQUxMF7C+fMXv0Jvsd4woZ+4ZmgvYhsTcKqiVX0eq7uAQn5VgdfmIihah VPSj6uM1AKm8l34G1EpJl0IPWgxkD8+k9FlmA5sCKE5C8DbglPKyN6tAwJ2ZflYecO7QxSnsd xxl+EJPNEat6RpTigdS5fFozZY412RNN1brcY2ov2uVXFCW20bo9blicTeN2yXrjBCNOiG4DH KsRqxtkd4C0dWclz7c/6hGGEOVOB9N2ya3FWD8DrdXdkxP6D/arLgfoFW1lVYsN1vCsCF9srx 2LpimAEn+9ob1W7ejG6z2Q0wtJybSaMYX5+qRfZpUhlotp/KzK0RvyFprl6nv/SecgJgMjh06 NobVSqWPc3IZbZ3hLR2bcjl+ZAvt03W5GWfv5XxaeMbos2JjW9r5/5hFpsj7UeSzgU818dyZK aA+AP2GjjZbycqKuMvI+ORCD1z36kjYAokOdnV0O9iWc/+jMHhX37y/S5ohXhjW0BOy/1gR7w NhXiqHSFLprYrgREy4N5CPaXS5bsPYdrMATfrNwQc3nW84DHnFb2+Ykx3GP9L2CzH+Y8= Cc: Arnd Bergmann , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "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 --- 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); } From patchwork Thu Nov 17 14:58:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101497 Delivered-To: patch@linaro.org Received: by 10.140.97.165 with SMTP id m34csp797866qge; Thu, 17 Nov 2016 06:59:11 -0800 (PST) X-Received: by 10.98.21.148 with SMTP id 142mr5421864pfv.38.1479394751362; Thu, 17 Nov 2016 06:59:11 -0800 (PST) Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id l9si3678134pgn.2.2016.11.17.06.59.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Nov 2016 06:59:11 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4E5336E2E9; Thu, 17 Nov 2016 14:58:40 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id A248A6E073 for ; Thu, 17 Nov 2016 14:58:35 +0000 (UTC) Received: from wuerfel.lan ([78.43.21.235]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0MGyyA-1c3anf3Kvi-00DnZD; Thu, 17 Nov 2016 15:58:21 +0100 From: Arnd Bergmann To: Dave Airlie Subject: [PATCH 2/2] Revert "drm/mediatek: set vblank_disable_allowed to true" Date: Thu, 17 Nov 2016 15:58:09 +0100 Message-Id: <20161117145809.4189126-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20161117145809.4189126-1-arnd@arndb.de> References: <20161117145809.4189126-1-arnd@arndb.de> X-Provags-ID: V03:K0:EnwpKtSb7+3JhsmNyVaG9uRmaUvNNy87BvluLV9219aZVox1d3G jyglfbjEiMNY6nXp13BK3W3rSySkz/FFmcC1Sk82AJqRcChCmXPDSabi2Nvq47k197HQi8a 9RsdBmUiCT0TiLNEhzAW9/Hh3f5xIPGyRy/mYPK59N0ZOEA8WeRntQfbMxIz94+RcwcTbK0 7Hrxo8swWrtmS1etkcTjg== X-UI-Out-Filterresults: notjunk:1; V01:K0:/zFKP4M5lKM=:b9OumWj4aP19qRBQk+hzS1 QNewc4LxqzhKCkDzkucnoq9FZrHwZNSmm8JuyYjixvAcERVFMlkgXJClzwz3cn50I0YR4Cutf jMQ+m9RViuh19dRBv/EgR1XhfzM05Wt7UscDdRCWoU2rBkq2V8JSjRZjKOv9jESWdxaVMlVqs pgx2Pr9TBRi9mxvFl6dg1Ffr2uXxB4x3yyQrzUWZH3DalB1Vc5jj2TVo4lOlX6g0NvbLk0DFo LtrnaQPY7KsPQo0wDX+3+U/axgo77uq6IJx4YqJXwE5t7VoxlS8KjXQzQ0R+3ebBBAC6EQQch OV5XcCTqD2cxbjj+2qCYyJyc0jvzHm0+EM9ggqm2xgYfWmj6JFjDVMcUegakW3ys5Ys/W1MmU Ncqu3kMasPVERKI1A8wDv7PrraRtL7zdJX3lbbNBnVWNzxDkifcW53pNDasiNHWkrwJwUFTHk 5K31CGP3kfowkMGRCszwv8kYm30ZOk3U4qDWqrChIA2TvMZGXJ3Egqzb8clne5fxqUgELfENp mudhJlXwt99VUstkjcFQFtIGksk/BiMMTe1z68GPor/n2hUzBbH0ZTZg8LPpeJlKAPRZy5qOl FSmvBwiwwt2gRAgnLuXIahugxv6mElGJfn2/gQ/HvEPLD6D3V1M4+eFsTfdmgbL2fMR2pkzMJ qPl2DPGbrS7STh0HOEJlYY7hjj7YI+NpIRYkBVmOSIXETj4WaW6j2kz+nSTNhm0V1P/E= Cc: Arnd Bergmann , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "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 --- 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);