From: Lyude Paul <lyude@redhat.com> To: intel-gfx@lists.freedesktop.org Cc: "Manasi Navare" <manasi.d.navare@intel.com>, "Ville Syrjälä" <ville.syrjala@linux.intel.com>, "Gustavo Padovan" <gustavo@padovan.org>, "Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>, "Sean Paul" <seanpaul@chromium.org>, "David Airlie" <airlied@linux.ie>, 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 [thread overview] Message-ID: <20180411234302.2896-4-lyude@redhat.com> (raw) In-Reply-To: <20180411234302.2896-1-lyude@redhat.com> 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 <lyude@redhat.com> Cc: Manasi Navare <manasi.d.navare@intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> 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
WARNING: multiple messages have this Message-ID (diff)
From: Lyude Paul <lyude@redhat.com> To: intel-gfx@lists.freedesktop.org Cc: David Airlie <airlied@linux.ie>, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Manasi Navare <manasi.d.navare@intel.com> 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 [thread overview] Message-ID: <20180411234302.2896-4-lyude@redhat.com> (raw) In-Reply-To: <20180411234302.2896-1-lyude@redhat.com> 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 <lyude@redhat.com> Cc: Manasi Navare <manasi.d.navare@intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> 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 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2018-04-11 23:43 UTC|newest] Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-04-11 23:42 [PATCH v8 00/10] drm/i915: Implement proper fallback training for MST Lyude Paul 2018-04-11 23:42 ` Lyude Paul 2018-04-11 23:42 ` [PATCH v8 01/10] drm/atomic: Print debug message on atomic check failure Lyude Paul 2018-04-11 23:42 ` Lyude Paul 2018-04-24 20:18 ` [Intel-gfx] " Dhinakaran Pandiyan 2018-04-24 20:18 ` Dhinakaran Pandiyan 2018-04-11 23:42 ` [PATCH v8 02/10] drm/i915: Move DP modeset retry work into intel_dp Lyude Paul 2018-04-11 23:42 ` Lyude Paul 2018-04-11 23:42 ` Lyude Paul [this message] 2018-04-11 23:42 ` [PATCH v8 03/10] drm/dp_mst: Fix naming on drm_atomic_get_mst_topology_state() Lyude Paul 2018-04-11 23:42 ` [PATCH v8 04/10] drm/dp_mst: Remove all evil duplicate state pointers Lyude Paul 2018-04-11 23:42 ` Lyude Paul 2018-04-11 23:42 ` [PATCH v8 05/10] drm/dp_mst: Make drm_dp_mst_topology_state subclassable Lyude Paul 2018-04-11 23:42 ` Lyude Paul 2018-04-11 23:42 ` [PATCH v8 06/10] drm/dp_mst: Add reset_state callback to topology mgr Lyude Paul 2018-04-11 23:42 ` Lyude Paul 2018-04-11 23:42 ` [PATCH v8 07/10] drm/i915: Only use one link bw config for MST topologies Lyude Paul 2018-04-11 23:42 ` Lyude Paul 2018-04-11 23:42 ` [PATCH v8 08/10] drm/i915: Make intel_dp_mst_atomic_check() idempotent Lyude Paul 2018-04-11 23:42 ` [PATCH v8 09/10] drm/dp_mst: Add MST fallback retraining helpers Lyude Paul 2018-04-11 23:42 ` [PATCH v8 10/10] drm/i915: Implement proper fallback training for MST Lyude Paul 2018-04-12 0:26 ` ✓ Fi.CI.BAT: success for drm/i915: Implement proper fallback training for MST (rev3) Patchwork 2018-04-12 4:30 ` ✓ Fi.CI.IGT: " Patchwork
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180411234302.2896-4-lyude@redhat.com \ --to=lyude@redhat.com \ --cc=airlied@linux.ie \ --cc=dri-devel@lists.freedesktop.org \ --cc=gustavo@padovan.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=linux-kernel@vger.kernel.org \ --cc=maarten.lankhorst@linux.intel.com \ --cc=manasi.d.navare@intel.com \ --cc=seanpaul@chromium.org \ --cc=ville.syrjala@linux.intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.