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: 9434389 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9670A60469 for ; Thu, 17 Nov 2016 14:58:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 88454293E0 for ; Thu, 17 Nov 2016 14:58:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7D1CF29448; Thu, 17 Nov 2016 14:58:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 23265293E0 for ; Thu, 17 Nov 2016 14:58:37 +0000 (UTC) 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" X-Virus-Scanned: ClamAV using ClamSMTP 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); }