Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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 <dmitry.baryshkov@linaro.org>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/622210/
Link: https://lore.kernel.org/r/20241029-msm-dp-rename-v2-2-13c5c03fad44@linaro.org
+18
-18
+18
-18
drivers/gpu/drm/msm/dp/dp_drm.c
+18
-18
drivers/gpu/drm/msm/dp/dp_drm.c
···
115
115
.debugfs_init = msm_dp_bridge_debugfs_init,
116
116
};
117
117
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,
119
119
struct drm_bridge_state *bridge_state,
120
120
struct drm_crtc_state *crtc_state,
121
121
struct drm_connector_state *conn_state)
···
136
136
return 0;
137
137
}
138
138
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,
140
140
struct drm_bridge_state *old_bridge_state)
141
141
{
142
142
struct drm_atomic_state *atomic_state = old_bridge_state->base.state;
···
147
147
148
148
/*
149
149
* 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.
151
151
* If the panel is in psr, just exit psr state and skip the full
152
152
* bridge enable sequence.
153
153
*/
···
166
166
msm_dp_bridge_atomic_enable(drm_bridge, old_bridge_state);
167
167
}
168
168
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,
170
170
struct drm_bridge_state *old_bridge_state)
171
171
{
172
172
struct drm_atomic_state *atomic_state = old_bridge_state->base.state;
···
194
194
* If old crtc state is active, then this is a display disable
195
195
* call while the sink is in psr state. So, exit psr here.
196
196
* The eDP controller will be disabled in the
197
-
* edp_bridge_atomic_post_disable function.
197
+
* msm_edp_bridge_atomic_post_disable function.
198
198
*
199
199
* We observed sink is stuck in self refresh if psr exit is skipped
200
200
* when display disable occurs while the sink is in psr state.
···
211
211
msm_dp_bridge_atomic_disable(drm_bridge, old_bridge_state);
212
212
}
213
213
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,
215
215
struct drm_bridge_state *old_bridge_state)
216
216
{
217
217
struct drm_atomic_state *atomic_state = old_bridge_state->base.state;
···
228
228
return;
229
229
230
230
/*
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.
232
232
*/
233
233
if (new_crtc_state->self_refresh_active)
234
234
return;
···
237
237
}
238
238
239
239
/**
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
241
241
* @bridge: Pointer to drm bridge structure
242
242
* @info: display info
243
243
* @mode: Pointer to drm mode structure
244
244
* Returns: Validity status for specified mode
245
245
*/
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,
247
247
const struct drm_display_info *info,
248
248
const struct drm_display_mode *mode)
249
249
{
···
268
268
return MODE_OK;
269
269
}
270
270
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)
272
272
{
273
273
struct msm_dp *dp = to_dp_bridge(bridge)->msm_dp_display;
274
274
275
275
msm_dp_display_debugfs_init(dp, root, true);
276
276
}
277
277
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,
282
282
.mode_set = msm_dp_bridge_mode_set,
283
-
.mode_valid = edp_bridge_mode_valid,
283
+
.mode_valid = msm_edp_bridge_mode_valid,
284
284
.atomic_reset = drm_atomic_helper_bridge_reset,
285
285
.atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state,
286
286
.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,
289
289
};
290
290
291
291
int msm_dp_bridge_init(struct msm_dp *msm_dp_display, struct drm_device *dev,
···
302
302
msm_dp_bridge->msm_dp_display = msm_dp_display;
303
303
304
304
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;
306
306
bridge->type = msm_dp_display->connector_type;
307
307
bridge->ycbcr_420_allowed = yuv_supported;
308
308