Received: by 10.192.165.156 with SMTP id m28csp1307396imm; Wed, 11 Apr 2018 16:48:21 -0700 (PDT) X-Google-Smtp-Source: AIpwx4811nrqbDVYD5lPuywWngynJMS3+0pTHBlI5bjSCQZ90hWhy03QSjG+kPDCFGK0FKFDf0aI X-Received: by 10.98.202.212 with SMTP id y81mr5663448pfk.227.1523490501027; Wed, 11 Apr 2018 16:48:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523490500; cv=none; d=google.com; s=arc-20160816; b=oPbJvUX9ssSpsBIKCb0fD2E3D/8dBreluI7PbA5JkUglPqObOo/kfHixIPMuuDCxJ7 swqh17f5gksFl03Z+aip+JKT4BH/Q5CzCjguUc5FXlBI482P8NHmreqiC/Tvml7xtC/H qJNf9Uu10MGSauYZtaWIww+WJH8bZNRV5tStLxrzATAbfmFxQ4EURU/DbSsD7BeQzrsY E+xtf5xWLeSuJlGOKR2VAHa5/AQ0s4vC71JnoyAGEEPgNLwjXU7StypILbnQVfqus6eg e25cf9CzmTdwVZDQRXqlwBLL1syadVi2kMr+3loex7Nv9uIrbSJ2AcMSCC2GjVzmLbbY NHmQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=5QFlDs2ECQsE8uqovo1sDNJ8O4ji9lzmKmElalDvdkE=; b=QaCHIs8hm4Dc20Z1YCoha3IcjHQzuR8TTsiZL7jyrs+deJ9lT54evMEBUp+i5309X1 SfWF5Gds0Khq2V7+88KT/fPbxPLho2a7JWwYqPZK++BCco/CWYRo8mx4MHEOa0F2axgF Ir34+KX1JD95zyGNeWPoDbUz4IiHAZqUuC9aoSNowR8+kBEUoiYgD3iUj7jqP8cUESsL uljTiYTCcfpvfhB83jWONOhKoHwl9WtU+7PEnV227xRJzLojtWYeGMgFfUuDDs21tNa6 VMmQgbRo4SWVy74/7wlwPG8O3bmyUXT+AcShTrqHU0s34yULOOhTQr2lqMDqcfDSQt+U 5AYg== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t14-v6si2113822plm.588.2018.04.11.16.47.44; Wed, 11 Apr 2018 16:48: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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752666AbeDKXna (ORCPT + 99 others); Wed, 11 Apr 2018 19:43:30 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:40912 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752406AbeDKXnO (ORCPT ); Wed, 11 Apr 2018 19:43:14 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B6A8840201A6; Wed, 11 Apr 2018 23:43:13 +0000 (UTC) Received: from malachite.bss.redhat.com (dhcp-10-20-1-55.bss.redhat.com [10.20.1.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 693CB10B0F2B; Wed, 11 Apr 2018 23:43:13 +0000 (UTC) From: Lyude Paul To: intel-gfx@lists.freedesktop.org Cc: Manasi Navare , =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Gustavo Padovan , Maarten Lankhorst , Sean Paul , David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v8 03/10] drm/dp_mst: Fix naming on drm_atomic_get_mst_topology_state() Date: Wed, 11 Apr 2018 19:42:42 -0400 Message-Id: <20180411234302.2896-4-lyude@redhat.com> In-Reply-To: <20180411234302.2896-1-lyude@redhat.com> References: <20180411234302.2896-1-lyude@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Wed, 11 Apr 2018 23:43:13 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Wed, 11 Apr 2018 23:43:13 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'lyude@redhat.com' RCPT:'' Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since these functions are dealing with an atomic state that needs to be modified during atomic check and commit, change the naming on this function to drm_atomic_dp_mst_get_topology_state() since we're the only one using the function, and it's more consistent with the naming scheme used in drm_atomic.c/drm_atomic_helper.c. Signed-off-by: Lyude Paul Cc: Manasi Navare Cc: Ville Syrjälä V7: - Fix CHECKPATCH errors --- drivers/gpu/drm/drm_dp_mst_topology.c | 13 +++++++------ include/drm/drm_dp_mst_helper.h | 6 ++++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 6fac4129e6a2..ba67f1782a04 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -2622,7 +2622,7 @@ int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state, struct drm_dp_mst_topology_state *topology_state; int req_slots; - topology_state = drm_atomic_get_mst_topology_state(state, mgr); + topology_state = drm_atomic_dp_mst_get_topology_state(state, mgr); if (IS_ERR(topology_state)) return PTR_ERR(topology_state); @@ -2662,7 +2662,7 @@ int drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state, { struct drm_dp_mst_topology_state *topology_state; - topology_state = drm_atomic_get_mst_topology_state(state, mgr); + topology_state = drm_atomic_dp_mst_get_topology_state(state, mgr); if (IS_ERR(topology_state)) return PTR_ERR(topology_state); @@ -3129,7 +3129,7 @@ static const struct drm_private_state_funcs mst_state_funcs = { }; /** - * drm_atomic_get_mst_topology_state: get MST topology state + * drm_atomic_dp_mst_get_topology_state: get MST topology state * * @state: global atomic state * @mgr: MST topology manager, also the private object in this case @@ -3143,15 +3143,16 @@ static const struct drm_private_state_funcs mst_state_funcs = { * * The MST topology state or error pointer. */ -struct drm_dp_mst_topology_state *drm_atomic_get_mst_topology_state(struct drm_atomic_state *state, - struct drm_dp_mst_topology_mgr *mgr) +struct drm_dp_mst_topology_state * +drm_atomic_dp_mst_get_topology_state(struct drm_atomic_state *state, + struct drm_dp_mst_topology_mgr *mgr) { struct drm_device *dev = mgr->dev; WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex)); return to_dp_mst_topology_state(drm_atomic_get_private_obj_state(state, &mgr->base)); } -EXPORT_SYMBOL(drm_atomic_get_mst_topology_state); +EXPORT_SYMBOL(drm_atomic_dp_mst_get_topology_state); /** * drm_dp_mst_topology_mgr_init - initialise a topology manager diff --git a/include/drm/drm_dp_mst_helper.h b/include/drm/drm_dp_mst_helper.h index 7f78d26a0766..2f6203407fd2 100644 --- a/include/drm/drm_dp_mst_helper.h +++ b/include/drm/drm_dp_mst_helper.h @@ -623,8 +623,10 @@ void drm_dp_mst_dump_topology(struct seq_file *m, void drm_dp_mst_topology_mgr_suspend(struct drm_dp_mst_topology_mgr *mgr); int drm_dp_mst_topology_mgr_resume(struct drm_dp_mst_topology_mgr *mgr); -struct drm_dp_mst_topology_state *drm_atomic_get_mst_topology_state(struct drm_atomic_state *state, - struct drm_dp_mst_topology_mgr *mgr); + +struct drm_dp_mst_topology_state * +drm_atomic_dp_mst_get_topology_state(struct drm_atomic_state *state, + struct drm_dp_mst_topology_mgr *mgr); int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state, struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port, int pbn); -- 2.14.3