Skip to content

Commit f47e87b

Browse files
committed
drm/msm/dp: rename edp_ bridge functions and struct
Follow the estalished prefix and rename eDP bridge symbols to use msm_edp_ prefix, moving the edp to the end of the symbol name. Signed-off-by: Dmitry Baryshkov <[email protected]> Reviewed-by: Abhinav Kumar <[email protected]> Patchwork: https://patchwork.freedesktop.org/patch/622210/ Link: https://lore.kernel.org/r/[email protected]
1 parent fb7d509 commit f47e87b

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

drivers/gpu/drm/msm/dp/dp_drm.c

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ static const struct drm_bridge_funcs msm_dp_bridge_ops = {
115115
.debugfs_init = msm_dp_bridge_debugfs_init,
116116
};
117117

118-
static int edp_bridge_atomic_check(struct drm_bridge *drm_bridge,
118+
static int msm_edp_bridge_atomic_check(struct drm_bridge *drm_bridge,
119119
struct drm_bridge_state *bridge_state,
120120
struct drm_crtc_state *crtc_state,
121121
struct drm_connector_state *conn_state)
@@ -136,7 +136,7 @@ static int edp_bridge_atomic_check(struct drm_bridge *drm_bridge,
136136
return 0;
137137
}
138138

139-
static void edp_bridge_atomic_enable(struct drm_bridge *drm_bridge,
139+
static void msm_edp_bridge_atomic_enable(struct drm_bridge *drm_bridge,
140140
struct drm_bridge_state *old_bridge_state)
141141
{
142142
struct drm_atomic_state *atomic_state = old_bridge_state->base.state;
@@ -147,7 +147,7 @@ static void edp_bridge_atomic_enable(struct drm_bridge *drm_bridge,
147147

148148
/*
149149
* Check the old state of the crtc to determine if the panel
150-
* was put into psr state previously by the edp_bridge_atomic_disable.
150+
* was put into psr state previously by the msm_edp_bridge_atomic_disable.
151151
* If the panel is in psr, just exit psr state and skip the full
152152
* bridge enable sequence.
153153
*/
@@ -166,7 +166,7 @@ static void edp_bridge_atomic_enable(struct drm_bridge *drm_bridge,
166166
msm_dp_bridge_atomic_enable(drm_bridge, old_bridge_state);
167167
}
168168

169-
static void edp_bridge_atomic_disable(struct drm_bridge *drm_bridge,
169+
static void msm_edp_bridge_atomic_disable(struct drm_bridge *drm_bridge,
170170
struct drm_bridge_state *old_bridge_state)
171171
{
172172
struct drm_atomic_state *atomic_state = old_bridge_state->base.state;
@@ -194,7 +194,7 @@ static void edp_bridge_atomic_disable(struct drm_bridge *drm_bridge,
194194
* If old crtc state is active, then this is a display disable
195195
* call while the sink is in psr state. So, exit psr here.
196196
* The eDP controller will be disabled in the
197-
* edp_bridge_atomic_post_disable function.
197+
* msm_edp_bridge_atomic_post_disable function.
198198
*
199199
* We observed sink is stuck in self refresh if psr exit is skipped
200200
* when display disable occurs while the sink is in psr state.
@@ -211,7 +211,7 @@ static void edp_bridge_atomic_disable(struct drm_bridge *drm_bridge,
211211
msm_dp_bridge_atomic_disable(drm_bridge, old_bridge_state);
212212
}
213213

214-
static void edp_bridge_atomic_post_disable(struct drm_bridge *drm_bridge,
214+
static void msm_edp_bridge_atomic_post_disable(struct drm_bridge *drm_bridge,
215215
struct drm_bridge_state *old_bridge_state)
216216
{
217217
struct drm_atomic_state *atomic_state = old_bridge_state->base.state;
@@ -228,7 +228,7 @@ static void edp_bridge_atomic_post_disable(struct drm_bridge *drm_bridge,
228228
return;
229229

230230
/*
231-
* Self refresh mode is already set in edp_bridge_atomic_disable.
231+
* Self refresh mode is already set in msm_edp_bridge_atomic_disable.
232232
*/
233233
if (new_crtc_state->self_refresh_active)
234234
return;
@@ -237,13 +237,13 @@ static void edp_bridge_atomic_post_disable(struct drm_bridge *drm_bridge,
237237
}
238238

239239
/**
240-
* edp_bridge_mode_valid - callback to determine if specified mode is valid
240+
* msm_edp_bridge_mode_valid - callback to determine if specified mode is valid
241241
* @bridge: Pointer to drm bridge structure
242242
* @info: display info
243243
* @mode: Pointer to drm mode structure
244244
* Returns: Validity status for specified mode
245245
*/
246-
static enum drm_mode_status edp_bridge_mode_valid(struct drm_bridge *bridge,
246+
static enum drm_mode_status msm_edp_bridge_mode_valid(struct drm_bridge *bridge,
247247
const struct drm_display_info *info,
248248
const struct drm_display_mode *mode)
249249
{
@@ -268,24 +268,24 @@ static enum drm_mode_status edp_bridge_mode_valid(struct drm_bridge *bridge,
268268
return MODE_OK;
269269
}
270270

271-
static void edp_bridge_debugfs_init(struct drm_bridge *bridge, struct dentry *root)
271+
static void msm_edp_bridge_debugfs_init(struct drm_bridge *bridge, struct dentry *root)
272272
{
273273
struct msm_dp *dp = to_dp_bridge(bridge)->msm_dp_display;
274274

275275
msm_dp_display_debugfs_init(dp, root, true);
276276
}
277277

278-
static const struct drm_bridge_funcs edp_bridge_ops = {
279-
.atomic_enable = edp_bridge_atomic_enable,
280-
.atomic_disable = edp_bridge_atomic_disable,
281-
.atomic_post_disable = edp_bridge_atomic_post_disable,
278+
static const struct drm_bridge_funcs msm_edp_bridge_ops = {
279+
.atomic_enable = msm_edp_bridge_atomic_enable,
280+
.atomic_disable = msm_edp_bridge_atomic_disable,
281+
.atomic_post_disable = msm_edp_bridge_atomic_post_disable,
282282
.mode_set = msm_dp_bridge_mode_set,
283-
.mode_valid = edp_bridge_mode_valid,
283+
.mode_valid = msm_edp_bridge_mode_valid,
284284
.atomic_reset = drm_atomic_helper_bridge_reset,
285285
.atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state,
286286
.atomic_destroy_state = drm_atomic_helper_bridge_destroy_state,
287-
.atomic_check = edp_bridge_atomic_check,
288-
.debugfs_init = edp_bridge_debugfs_init,
287+
.atomic_check = msm_edp_bridge_atomic_check,
288+
.debugfs_init = msm_edp_bridge_debugfs_init,
289289
};
290290

291291
int msm_dp_bridge_init(struct msm_dp *msm_dp_display, struct drm_device *dev,
@@ -302,7 +302,7 @@ int msm_dp_bridge_init(struct msm_dp *msm_dp_display, struct drm_device *dev,
302302
msm_dp_bridge->msm_dp_display = msm_dp_display;
303303

304304
bridge = &msm_dp_bridge->bridge;
305-
bridge->funcs = msm_dp_display->is_edp ? &edp_bridge_ops : &msm_dp_bridge_ops;
305+
bridge->funcs = msm_dp_display->is_edp ? &msm_edp_bridge_ops : &msm_dp_bridge_ops;
306306
bridge->type = msm_dp_display->connector_type;
307307
bridge->ycbcr_420_allowed = yuv_supported;
308308

0 commit comments

Comments
 (0)