mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 13:53:33 +00:00
drm/display/dp_mst: Add drm_atomic_get_old_mst_topology_state()
Add a function to get the old MST topology state, required by a follow-up i915 patch. While at it clarify the code comment of drm_atomic_get_new_mst_topology_state() and add _new prefix to the new state pointer to remind about its difference from the old state. v2: Use old_/new_ prefixes for the state pointers. (Ville) Cc: Lyude Paul <lyude@redhat.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: stable@vger.kernel.org # 6.1 Cc: dri-devel@lists.freedesktop.org Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Lyude Paul <lyude@redhat.com> Acked-by: Lyude Paul <lyude@redhat.com> Acked-by: Daniel Vetter <daniel@ffwll.ch> Acked-by: Wayne Lin <wayne.lin@amd.com> Acked-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Imre Deak <imre.deak@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230206114856.2665066-3-imre.deak@intel.com
This commit is contained in:
parent
e761cc2094
commit
9ffdb67af0
2 changed files with 33 additions and 5 deletions
|
@ -5365,27 +5365,52 @@ struct drm_dp_mst_topology_state *drm_atomic_get_mst_topology_state(struct drm_a
|
||||||
EXPORT_SYMBOL(drm_atomic_get_mst_topology_state);
|
EXPORT_SYMBOL(drm_atomic_get_mst_topology_state);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* drm_atomic_get_new_mst_topology_state: get new MST topology state in atomic state, if any
|
* drm_atomic_get_old_mst_topology_state: get old MST topology state in atomic state, if any
|
||||||
* @state: global atomic state
|
* @state: global atomic state
|
||||||
* @mgr: MST topology manager, also the private object in this case
|
* @mgr: MST topology manager, also the private object in this case
|
||||||
*
|
*
|
||||||
* This function wraps drm_atomic_get_priv_obj_state() passing in the MST atomic
|
* This function wraps drm_atomic_get_old_private_obj_state() passing in the MST atomic
|
||||||
* state vtable so that the private object state returned is that of a MST
|
* state vtable so that the private object state returned is that of a MST
|
||||||
* topology object.
|
* topology object.
|
||||||
*
|
*
|
||||||
* Returns:
|
* Returns:
|
||||||
*
|
*
|
||||||
* The MST topology state, or NULL if there's no topology state for this MST mgr
|
* The old MST topology state, or NULL if there's no topology state for this MST mgr
|
||||||
|
* in the global atomic state
|
||||||
|
*/
|
||||||
|
struct drm_dp_mst_topology_state *
|
||||||
|
drm_atomic_get_old_mst_topology_state(struct drm_atomic_state *state,
|
||||||
|
struct drm_dp_mst_topology_mgr *mgr)
|
||||||
|
{
|
||||||
|
struct drm_private_state *old_priv_state =
|
||||||
|
drm_atomic_get_old_private_obj_state(state, &mgr->base);
|
||||||
|
|
||||||
|
return old_priv_state ? to_dp_mst_topology_state(old_priv_state) : NULL;
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(drm_atomic_get_old_mst_topology_state);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* drm_atomic_get_new_mst_topology_state: get new MST topology state in atomic state, if any
|
||||||
|
* @state: global atomic state
|
||||||
|
* @mgr: MST topology manager, also the private object in this case
|
||||||
|
*
|
||||||
|
* This function wraps drm_atomic_get_new_private_obj_state() passing in the MST atomic
|
||||||
|
* state vtable so that the private object state returned is that of a MST
|
||||||
|
* topology object.
|
||||||
|
*
|
||||||
|
* Returns:
|
||||||
|
*
|
||||||
|
* The new MST topology state, or NULL if there's no topology state for this MST mgr
|
||||||
* in the global atomic state
|
* in the global atomic state
|
||||||
*/
|
*/
|
||||||
struct drm_dp_mst_topology_state *
|
struct drm_dp_mst_topology_state *
|
||||||
drm_atomic_get_new_mst_topology_state(struct drm_atomic_state *state,
|
drm_atomic_get_new_mst_topology_state(struct drm_atomic_state *state,
|
||||||
struct drm_dp_mst_topology_mgr *mgr)
|
struct drm_dp_mst_topology_mgr *mgr)
|
||||||
{
|
{
|
||||||
struct drm_private_state *priv_state =
|
struct drm_private_state *new_priv_state =
|
||||||
drm_atomic_get_new_private_obj_state(state, &mgr->base);
|
drm_atomic_get_new_private_obj_state(state, &mgr->base);
|
||||||
|
|
||||||
return priv_state ? to_dp_mst_topology_state(priv_state) : NULL;
|
return new_priv_state ? to_dp_mst_topology_state(new_priv_state) : NULL;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(drm_atomic_get_new_mst_topology_state);
|
EXPORT_SYMBOL(drm_atomic_get_new_mst_topology_state);
|
||||||
|
|
||||||
|
|
|
@ -868,6 +868,9 @@ struct drm_dp_mst_topology_state *
|
||||||
drm_atomic_get_mst_topology_state(struct drm_atomic_state *state,
|
drm_atomic_get_mst_topology_state(struct drm_atomic_state *state,
|
||||||
struct drm_dp_mst_topology_mgr *mgr);
|
struct drm_dp_mst_topology_mgr *mgr);
|
||||||
struct drm_dp_mst_topology_state *
|
struct drm_dp_mst_topology_state *
|
||||||
|
drm_atomic_get_old_mst_topology_state(struct drm_atomic_state *state,
|
||||||
|
struct drm_dp_mst_topology_mgr *mgr);
|
||||||
|
struct drm_dp_mst_topology_state *
|
||||||
drm_atomic_get_new_mst_topology_state(struct drm_atomic_state *state,
|
drm_atomic_get_new_mst_topology_state(struct drm_atomic_state *state,
|
||||||
struct drm_dp_mst_topology_mgr *mgr);
|
struct drm_dp_mst_topology_mgr *mgr);
|
||||||
struct drm_dp_mst_atomic_payload *
|
struct drm_dp_mst_atomic_payload *
|
||||||
|
|
Loading…
Reference in a new issue