Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp1776250imm; Thu, 27 Sep 2018 02:16:20 -0700 (PDT) X-Google-Smtp-Source: ACcGV62N6tVJ04ocBnj3s0T2z12dfOTfIgcICjZ40Yp/FuF34/WARw3p3eEipp2tGYnkPo2cILp0 X-Received: by 2002:a62:1a16:: with SMTP id a22-v6mr10258465pfa.237.1538039780836; Thu, 27 Sep 2018 02:16:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538039780; cv=none; d=google.com; s=arc-20160816; b=NgZ55qzsP5rgKSsi6f2GCGhfLKbEhvcuLwZazs2MXHHBMfajyJodJZ36BZL+Bo0TGk heGTWfJ94Mnu1BzWVIQrhfRaznPE5HB+NnOJHARoYI6RrqGF8FjXf/ET/xIfFtBTj0VO HChfdAcBe4otYPEJFTh+kE5V3nWdeyQHahJPDkex53SGPB1TKarVMax3WLisO4/CdcOg mYFVvMolAJhDOTOolvEHOY+i2HZ8JlTw47YVGnJhujdXeyGFZMxgGgT6u53ns5/m8odA JOxapeZoRpV75gkYwUQw5hFxTaYWj57YCrMTiOBysiB/jUsPz6rCzODyG5bd5ev+W8pv tIaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from; bh=hQP4PLFbW93XYeia7cNlchWVZTw4gY+5jYh5VPUYYMI=; b=OGV7gxS64bzl9z/f13rjfFr56rr0qxrESXHk0Rovt7e0+YX9g2TmYXeFpxILaWn99O c+6cbPphD9ygE+NlqFWPyWMciIgBFRfLpx2KwV/fXeFjur/5VeJV7+NL7Wm7yiBnzkW/ b0GIKX6dYmaqPXkEunVrntETHPj1/bCBGeuaoFz0I4lq2l2LMXR/zwe0XuiO8kwSOB9R 9i75Nk+tTnVsQLQjj8EIb0SBykqxUg8+csqnJwBw2WG4S69p0BIpbHoeFCNuKryIQyeu /b+dkPFsB77umlaMmpXUXOTFr9tZZt7uOPgKxTN4sPUcbaaqtEL0Jr3MbbHlHHQkaXrG v6qA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f5-v6si1378221pgm.581.2018.09.27.02.16.05; Thu, 27 Sep 2018 02:16:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728401AbeI0PbL (ORCPT + 99 others); Thu, 27 Sep 2018 11:31:11 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:55492 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727404AbeI0PbL (ORCPT ); Thu, 27 Sep 2018 11:31:11 -0400 Received: from localhost (ip-213-127-77-73.ip.prioritytelecom.net [213.127.77.73]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 177B81117; Thu, 27 Sep 2018 09:13:53 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lyude Paul , Daniel Vetter , Sean Paul Subject: [PATCH 4.18 74/88] drm/atomic: Use drm_drv_uses_atomic_modeset() for debugfs creation Date: Thu, 27 Sep 2018 11:03:55 +0200 Message-Id: <20180927090309.614592493@linuxfoundation.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180927090300.631426620@linuxfoundation.org> References: <20180927090300.631426620@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Lyude Paul commit 3c499ea0c662e2f38aafbd4f516b08aab8cfa0e5 upstream. As pointed out by Daniel Vetter, we should be usinng drm_drv_uses_atomic_modeset() for determining whether or not we want to make the debugfs nodes for atomic instead of checking DRIVER_ATOMIC, as the former isn't an accurate representation of whether or not the driver is actually using atomic modesetting internally (even though it might not be exposing atomic capabilities). Signed-off-by: Lyude Paul Cc: Daniel Vetter Cc: stable@vger.kernel.org Reviewed-by: Sean Paul Link: https://patchwork.freedesktop.org/patch/msgid/20180917173733.21293-1-lyude@redhat.com Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/drm_atomic.c | 2 +- drivers/gpu/drm/drm_debugfs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -1838,7 +1838,7 @@ static void __drm_state_dump(struct drm_ struct drm_connector *connector; struct drm_connector_list_iter conn_iter; - if (!drm_core_check_feature(dev, DRIVER_ATOMIC)) + if (!drm_drv_uses_atomic_modeset(dev)) return; list_for_each_entry(plane, &config->plane_list, head) { --- a/drivers/gpu/drm/drm_debugfs.c +++ b/drivers/gpu/drm/drm_debugfs.c @@ -150,7 +150,7 @@ int drm_debugfs_init(struct drm_minor *m return ret; } - if (drm_core_check_feature(dev, DRIVER_ATOMIC)) { + if (drm_drv_uses_atomic_modeset(dev)) { ret = drm_atomic_debugfs_init(minor); if (ret) { DRM_ERROR("Failed to create atomic debugfs files\n");