mirror of
https://github.com/torvalds/linux.git
synced 2026-06-02 03:24:19 +02:00
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
This commit is contained in:
parent
fb7d509b17
commit
f47e87b079
|
|
@ -115,7 +115,7 @@ static const struct drm_bridge_funcs msm_dp_bridge_ops = {
|
|||
.debugfs_init = msm_dp_bridge_debugfs_init,
|
||||
};
|
||||
|
||||
static int edp_bridge_atomic_check(struct drm_bridge *drm_bridge,
|
||||
static int msm_edp_bridge_atomic_check(struct drm_bridge *drm_bridge,
|
||||
struct drm_bridge_state *bridge_state,
|
||||
struct drm_crtc_state *crtc_state,
|
||||
struct drm_connector_state *conn_state)
|
||||
|
|
@ -136,7 +136,7 @@ static int edp_bridge_atomic_check(struct drm_bridge *drm_bridge,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void edp_bridge_atomic_enable(struct drm_bridge *drm_bridge,
|
||||
static void msm_edp_bridge_atomic_enable(struct drm_bridge *drm_bridge,
|
||||
struct drm_bridge_state *old_bridge_state)
|
||||
{
|
||||
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,
|
|||
|
||||
/*
|
||||
* Check the old state of the crtc to determine if the panel
|
||||
* was put into psr state previously by the edp_bridge_atomic_disable.
|
||||
* was put into psr state previously by the msm_edp_bridge_atomic_disable.
|
||||
* If the panel is in psr, just exit psr state and skip the full
|
||||
* bridge enable sequence.
|
||||
*/
|
||||
|
|
@ -166,7 +166,7 @@ static void edp_bridge_atomic_enable(struct drm_bridge *drm_bridge,
|
|||
msm_dp_bridge_atomic_enable(drm_bridge, old_bridge_state);
|
||||
}
|
||||
|
||||
static void edp_bridge_atomic_disable(struct drm_bridge *drm_bridge,
|
||||
static void msm_edp_bridge_atomic_disable(struct drm_bridge *drm_bridge,
|
||||
struct drm_bridge_state *old_bridge_state)
|
||||
{
|
||||
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,
|
|||
* If old crtc state is active, then this is a display disable
|
||||
* call while the sink is in psr state. So, exit psr here.
|
||||
* The eDP controller will be disabled in the
|
||||
* edp_bridge_atomic_post_disable function.
|
||||
* msm_edp_bridge_atomic_post_disable function.
|
||||
*
|
||||
* We observed sink is stuck in self refresh if psr exit is skipped
|
||||
* 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,
|
|||
msm_dp_bridge_atomic_disable(drm_bridge, old_bridge_state);
|
||||
}
|
||||
|
||||
static void edp_bridge_atomic_post_disable(struct drm_bridge *drm_bridge,
|
||||
static void msm_edp_bridge_atomic_post_disable(struct drm_bridge *drm_bridge,
|
||||
struct drm_bridge_state *old_bridge_state)
|
||||
{
|
||||
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,
|
|||
return;
|
||||
|
||||
/*
|
||||
* Self refresh mode is already set in edp_bridge_atomic_disable.
|
||||
* Self refresh mode is already set in msm_edp_bridge_atomic_disable.
|
||||
*/
|
||||
if (new_crtc_state->self_refresh_active)
|
||||
return;
|
||||
|
|
@ -237,13 +237,13 @@ static void edp_bridge_atomic_post_disable(struct drm_bridge *drm_bridge,
|
|||
}
|
||||
|
||||
/**
|
||||
* edp_bridge_mode_valid - callback to determine if specified mode is valid
|
||||
* msm_edp_bridge_mode_valid - callback to determine if specified mode is valid
|
||||
* @bridge: Pointer to drm bridge structure
|
||||
* @info: display info
|
||||
* @mode: Pointer to drm mode structure
|
||||
* Returns: Validity status for specified mode
|
||||
*/
|
||||
static enum drm_mode_status edp_bridge_mode_valid(struct drm_bridge *bridge,
|
||||
static enum drm_mode_status msm_edp_bridge_mode_valid(struct drm_bridge *bridge,
|
||||
const struct drm_display_info *info,
|
||||
const struct drm_display_mode *mode)
|
||||
{
|
||||
|
|
@ -268,24 +268,24 @@ static enum drm_mode_status edp_bridge_mode_valid(struct drm_bridge *bridge,
|
|||
return MODE_OK;
|
||||
}
|
||||
|
||||
static void edp_bridge_debugfs_init(struct drm_bridge *bridge, struct dentry *root)
|
||||
static void msm_edp_bridge_debugfs_init(struct drm_bridge *bridge, struct dentry *root)
|
||||
{
|
||||
struct msm_dp *dp = to_dp_bridge(bridge)->msm_dp_display;
|
||||
|
||||
msm_dp_display_debugfs_init(dp, root, true);
|
||||
}
|
||||
|
||||
static const struct drm_bridge_funcs edp_bridge_ops = {
|
||||
.atomic_enable = edp_bridge_atomic_enable,
|
||||
.atomic_disable = edp_bridge_atomic_disable,
|
||||
.atomic_post_disable = edp_bridge_atomic_post_disable,
|
||||
static const struct drm_bridge_funcs msm_edp_bridge_ops = {
|
||||
.atomic_enable = msm_edp_bridge_atomic_enable,
|
||||
.atomic_disable = msm_edp_bridge_atomic_disable,
|
||||
.atomic_post_disable = msm_edp_bridge_atomic_post_disable,
|
||||
.mode_set = msm_dp_bridge_mode_set,
|
||||
.mode_valid = edp_bridge_mode_valid,
|
||||
.mode_valid = msm_edp_bridge_mode_valid,
|
||||
.atomic_reset = drm_atomic_helper_bridge_reset,
|
||||
.atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state,
|
||||
.atomic_destroy_state = drm_atomic_helper_bridge_destroy_state,
|
||||
.atomic_check = edp_bridge_atomic_check,
|
||||
.debugfs_init = edp_bridge_debugfs_init,
|
||||
.atomic_check = msm_edp_bridge_atomic_check,
|
||||
.debugfs_init = msm_edp_bridge_debugfs_init,
|
||||
};
|
||||
|
||||
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,
|
|||
msm_dp_bridge->msm_dp_display = msm_dp_display;
|
||||
|
||||
bridge = &msm_dp_bridge->bridge;
|
||||
bridge->funcs = msm_dp_display->is_edp ? &edp_bridge_ops : &msm_dp_bridge_ops;
|
||||
bridge->funcs = msm_dp_display->is_edp ? &msm_edp_bridge_ops : &msm_dp_bridge_ops;
|
||||
bridge->type = msm_dp_display->connector_type;
|
||||
bridge->ycbcr_420_allowed = yuv_supported;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user