From patchwork Tue Jun 21 09:10:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9189963 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 76E646089F for ; Tue, 21 Jun 2016 09:11:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 63FC727FBB for ; Tue, 21 Jun 2016 09:11:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 58DAD27FE4; Tue, 21 Jun 2016 09:11:02 +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 64AD927FBB for ; Tue, 21 Jun 2016 09:11:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D5ADC6E689; Tue, 21 Jun 2016 09:10:50 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf0-x244.google.com (mail-lf0-x244.google.com [IPv6:2a00:1450:4010:c07::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 908AA6E67E for ; Tue, 21 Jun 2016 09:10:47 +0000 (UTC) Received: by mail-lf0-x244.google.com with SMTP id w130so2053433lfd.2 for ; Tue, 21 Jun 2016 02:10:47 -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=K0nnYG3KIqWvnkNldWNJfFcFIIs/WbqdPlTSKqbl4uc=; b=hTj/g8X5V74RQP3COVYqyjWh9Xac+r044BwTokd387MhDEzFtyZNSWTqk9lEqWEMfy DF3YITUQVvNb6fy+3IgjTOMq4j6k84uPwQHRwjqoggs46eDIW+DfZ8e1nhqlpCw/zHjc mVozh+y9JAfILvOeS0+JipyuE70u4ucgm86S8= 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=K0nnYG3KIqWvnkNldWNJfFcFIIs/WbqdPlTSKqbl4uc=; b=IixgNBJOMKGvA+doAhty1pj8gViopmwWDuruHZSoBcsaTMF6W1WeNvAc3nanyjBytm W+iqPkjD4Lzrm/flrJenEraR9it00hMiKrJiPvL8YxVweRi3zuFhNbxbByifXNkjhJ2z 48ggvGhL2cj0VOdSLvIbLexDzxPT1E3pNs6wOc5aBM2Ri67URn90N9T27yjzwZEAJb5e 1zNnPZM7AAXpu/K5QNFKrlhPBHC8iTUoWMmtlK9EqkU3qIkKVhYsXs4y1igYAQBe3+Lg cF08jZ896Wo1x+Q8TgJ5rh4leRpbp2mNVGJ+eAroTODYs+kmqcrfqZFLavpfymrwBRAr ae4A== X-Gm-Message-State: ALyK8tJErKQ9y6NPoR11mylLXrriMuqR104Q4n55J7cFj5JvbOtHVuyvocRT+a0nES4kkg== X-Received: by 10.28.215.139 with SMTP id o133mr2201457wmg.74.1466500245246; Tue, 21 Jun 2016 02:10:45 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id v70sm1930380wmf.18.2016.06.21.02.10.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Jun 2016 02:10:44 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 04/10] drm/i915: Use use the drm_for_each_connector in i915_debugfs.c Date: Tue, 21 Jun 2016 11:10:29 +0200 Message-Id: <1466500235-21282-5-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1466500235-21282-1-git-send-email-daniel.vetter@ffwll.ch> References: <1466500235-21282-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter 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 I noticed that we don't have any locking. drm_for_each_connector will soon encapsulate late, so just roll that macro out as prep work. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/i915_debugfs.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 5b7526697838..ea0e6cf2dc07 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -4364,14 +4364,12 @@ static ssize_t i915_displayport_test_active_write(struct file *file, int status = 0; struct drm_device *dev; struct drm_connector *connector; - struct list_head *connector_list; + struct drm_connector_iter iter; struct intel_dp *intel_dp; int val = 0; dev = ((struct seq_file *)file->private_data)->private; - connector_list = &dev->mode_config.connector_list; - if (len == 0) return 0; @@ -4387,8 +4385,7 @@ static ssize_t i915_displayport_test_active_write(struct file *file, input_buffer[len] = '\0'; DRM_DEBUG_DRIVER("Copied %d bytes from user\n", (unsigned int)len); - list_for_each_entry(connector, connector_list, head) { - + drm_for_each_connector(connector, dev, iter) { if (connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort) continue; @@ -4422,11 +4419,10 @@ static int i915_displayport_test_active_show(struct seq_file *m, void *data) { struct drm_device *dev = m->private; struct drm_connector *connector; - struct list_head *connector_list = &dev->mode_config.connector_list; struct intel_dp *intel_dp; + struct drm_connector_iter iter; - list_for_each_entry(connector, connector_list, head) { - + drm_for_each_connector(connector, dev, iter) { if (connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort) continue; @@ -4466,11 +4462,10 @@ static int i915_displayport_test_data_show(struct seq_file *m, void *data) { struct drm_device *dev = m->private; struct drm_connector *connector; - struct list_head *connector_list = &dev->mode_config.connector_list; + struct drm_connector_iter iter; struct intel_dp *intel_dp; - list_for_each_entry(connector, connector_list, head) { - + drm_for_each_connector(connector, dev, iter) { if (connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort) continue; @@ -4505,11 +4500,10 @@ static int i915_displayport_test_type_show(struct seq_file *m, void *data) { struct drm_device *dev = m->private; struct drm_connector *connector; - struct list_head *connector_list = &dev->mode_config.connector_list; struct intel_dp *intel_dp; + struct drm_connector_iter iter; - list_for_each_entry(connector, connector_list, head) { - + drm_for_each_connector(connector, dev, iter) { if (connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort) continue;