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: 9434391 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 D36B360469 for ; Thu, 17 Nov 2016 14:58:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C4E052937A for ; Thu, 17 Nov 2016 14:58:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B76E929437; Thu, 17 Nov 2016 14:58:41 +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 78E4A2937A for ; Thu, 17 Nov 2016 14:58:41 +0000 (UTC) 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" X-Virus-Scanned: ClamAV using ClamSMTP 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);