Skip to content

Commit 8b6b679

Browse files
committed
drm/i915/dp_mst: Rename intel_dp::mst.active_links to mst.active_streams
intel_dp::mst.active_links actually indicates the number of MST streams, not the number of MST links (one MST link carrying one or more MST streams), rename the field accordingly. Reviewed-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Imre Deak <imre.deak@intel.com> Link: https://lore.kernel.org/r/20250404150310.1156696-7-imre.deak@intel.com
1 parent 4f41071 commit 8b6b679

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

drivers/gpu/drm/i915/display/intel_display_types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1739,7 +1739,7 @@ struct intel_dp {
17391739
struct {
17401740
struct intel_dp_mst_encoder *stream_encoders[I915_MAX_PIPES];
17411741
struct drm_dp_mst_topology_mgr mgr;
1742-
int active_links;
1742+
int active_streams;
17431743
} mst;
17441744

17451745
u32 (*get_aux_clock_divider)(struct intel_dp *dp, int index);

drivers/gpu/drm/i915/display/intel_dp_mst.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,30 +107,30 @@ static struct intel_dp *to_primary_dp(struct intel_encoder *encoder)
107107

108108
int intel_dp_mst_active_streams(struct intel_dp *intel_dp)
109109
{
110-
return intel_dp->mst.active_links;
110+
return intel_dp->mst.active_streams;
111111
}
112112

113113
static bool intel_dp_mst_dec_active_streams(struct intel_dp *intel_dp)
114114
{
115115
struct intel_display *display = to_intel_display(intel_dp);
116116

117117
drm_dbg_kms(display->drm, "active MST streams %d -> %d\n",
118-
intel_dp->mst.active_links, intel_dp->mst.active_links - 1);
118+
intel_dp->mst.active_streams, intel_dp->mst.active_streams - 1);
119119

120-
if (drm_WARN_ON(display->drm, intel_dp->mst.active_links == 0))
120+
if (drm_WARN_ON(display->drm, intel_dp->mst.active_streams == 0))
121121
return true;
122122

123-
return --intel_dp->mst.active_links == 0;
123+
return --intel_dp->mst.active_streams == 0;
124124
}
125125

126126
static bool intel_dp_mst_inc_active_streams(struct intel_dp *intel_dp)
127127
{
128128
struct intel_display *display = to_intel_display(intel_dp);
129129

130130
drm_dbg_kms(display->drm, "active MST streams %d -> %d\n",
131-
intel_dp->mst.active_links, intel_dp->mst.active_links + 1);
131+
intel_dp->mst.active_streams, intel_dp->mst.active_streams + 1);
132132

133-
return intel_dp->mst.active_links++ == 0;
133+
return intel_dp->mst.active_streams++ == 0;
134134
}
135135

136136
static int intel_dp_mst_max_dpt_bpp(const struct intel_crtc_state *crtc_state,

0 commit comments

Comments
 (0)