From patchwork Wed Jun 1 22:07:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9148565 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 AA9FB60467 for ; Wed, 1 Jun 2016 22:08:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9E1CA2040D for ; Wed, 1 Jun 2016 22:08:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9303F265F9; Wed, 1 Jun 2016 22:08:40 +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.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 304322040D for ; Wed, 1 Jun 2016 22:08:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E99EF6EABF; Wed, 1 Jun 2016 22:08:02 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 018906EABF for ; Wed, 1 Jun 2016 22:08:01 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id e3so10584549wme.2 for ; Wed, 01 Jun 2016 15:08:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=z3swqO3B41mtdtrCkV2H2yKAsK+aciWmYoHILkAzr/8=; b=Xzy/6SJGLSbgha18VjIjw5rYl/bJQUyheONbXDlfkcSLDHMamlzZO4oU3skO48VyrX nf9Tljpj5ExJNvZgrIyBdH3dgCaDr8GyiLotZjy4XCJo+1CDNvJGUnC+GMSF168in9OO 2vfDqt8hWNRbWQMuDyKAzubzAJtd9uelHTzhQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=z3swqO3B41mtdtrCkV2H2yKAsK+aciWmYoHILkAzr/8=; b=F0elrR24BD11DVzAyGr0Sdrtunt9sTC7I/u9VXmUYb3tETcMzYX3an4DXdg2rzTFhL tBoz56fNodhoBIptxwmAliuGp95ivv48IaWmHAKD+4rjJDv05tf7rxPHBeJb078y6bbv KgdRgDysEoJuCsBYuN+JeS3Y02ule0tKwbhEVrTPl6DnBb7jdXdz7hlausMg8jrLyjR6 3CqNq0O8W2HihUMdVyCgJS/EMckUQLifeUDMkHjxBb9G7GDBLDw8aR955adLHsOe/mUU eGCFWamr2MXocEVt3/cXC1hO+bJHldqNKK68GblSRxGxusaACBv41rKtf4+XPE+a7UPk e6VA== X-Gm-Message-State: ALyK8tISFC+LKxRauZ153xauiTeQZHU9sjfjboXDiwxyw5Xmbxf/s62bx1bw2g5AaEhjBw== X-Received: by 10.28.63.5 with SMTP id m5mr24623126wma.24.1464818879111; Wed, 01 Jun 2016 15:07:59 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id lf7sm1571508wjb.23.2016.06.01.15.07.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Jun 2016 15:07:57 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Thu, 2 Jun 2016 00:07:01 +0200 Message-Id: <1464818821-5736-39-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1464818821-5736-1-git-send-email-daniel.vetter@ffwll.ch> References: <1464818821-5736-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , Tomeu Vizoso Subject: [Intel-gfx] [PATCH 38/38] drm/crtc-helper: disable_unused_functions really isn't for atomic X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Rockchip just blew up here on testing, because I removed some "is this crtc already disabled/enabled" state tracking from callbacks (not needed with atomic). Turns out that was needed to work around rockchip still calling legacy helper code. Since me explaining on irc/mailing-list plus kerneldoc isn't enough, be more verbose and add dmesg output. Not that anyone actually reads that, either. Cc: Tomeu Vizoso Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_crtc_helper.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c index a6e42433ef0e..b47ec24939a0 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c @@ -232,6 +232,9 @@ static void __drm_helper_disable_unused_functions(struct drm_device *dev) */ void drm_helper_disable_unused_functions(struct drm_device *dev) { + if (drm_core_check_feature(dev, DRIVER_ATOMIC)) + DRM_ERROR("Called for atomic driver, this is not what you want.\n"); + drm_modeset_lock_all(dev); __drm_helper_disable_unused_functions(dev); drm_modeset_unlock_all(dev);