From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964988AbcKQRpk (ORCPT ); Thu, 17 Nov 2016 12:45:40 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:61853 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753085AbcKQRpS (ORCPT ); Thu, 17 Nov 2016 12:45:18 -0500 From: Arnd Bergmann To: Dave Airlie Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Philipp Zabel , Hu , Bibby Hsieh , Arnd Bergmann 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:PECCiWAMl9U=:b/jV998aXfcb7Wzt2gVr2q tT6HIa+ks/WoIN2pY0mapi+rROsgqjRGEOuzc/P2SY/s/CvzPolHCL4fBxu6p7O4S+t/rsOht E9SD/HHZFfsTVDKBHWlRTtKWFfllwjL1csiMIN9r0XrODxZdr+1SJPM3gIGOSaprpP3pGXlUQ WJTs2Z49qei6bitYhRWgpHZnlG7x41ALnYvY79F3zNkYSglC6qj5qpiaI+dUXy6DenFM7xgah 68T1tQblA6UPv/9fiEKEEpz90cYiamvD0eD/58ZHXvcKxbMT7ml4qjbGinvgP45C0VYV/TBpX nccwRGb8dYGq6aJnBs4BSEw5KoOnO6qIAqeOo/etSgMt4M6QUSZUC1UQ8o2gX4oTpoV00ppkz 3lSmGNPolVg0EL7yr7zzAnYN0c5ZTrQvVkHQF+NWfkyvxBCc72EJQZ7OeddnDnhc3uf16ZszA viUev73e0082InZdJhWI1q5LMqVFRrf5IA0it8YsDeOCwrFeszydgHrjaq1HsOzj/TQiul3Lr 2z43pUkXnUXI7bBdVKhiYZh92KsCAzOC3oDKV56Sv8883VMeNlr9OKe2Vl/mJWrFj2QyomLqe Q/lKfLf6d32lhYSH6bler/43V7s0/C0ayDhhAPOjQZzMYYaZmFliRdoyALMKobTPeSTg1w0DT Ct4LiVnaCnLjrBRi3qQFHBembmdgP6KGXRQ1BKUuD3+Qw/eAv0HfaPuBqBRrvkwRBeRg= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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); -- 2.9.0