Skip to content

L
linux
Commit 3ed77f33 authored by Paloma Arellano's avatar Paloma Arellano Committed by Dmitry Baryshkov
Browse files
Options

drm/msm/dp: rename wide_bus_en to wide_bus_supported 

Rename wide_bus_en to wide_bus_supported in dp_display_private to
correctly establish that the parameter is referencing if wide bus is
supported instead of enabled.
Signed-off-by: default avatarPaloma Arellano <quic_parellan@quicinc.com>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/579613/
Link: https://lore.kernel.org/r/20240222194025.25329-7-quic_parellan@quicinc.comSigned-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent 0ab07bb9
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 21 deletions
drivers/gpu/drm/msm/dp/dp_display.c
View file @ 3ed77f33
...@@ -111,7 +111,7 @@ struct dp_display_private { ...@@ -111,7 +111,7 @@ struct dp_display_private {
struct dp_event event_list[DP_EVENT_Q_MAX]; struct dp_event event_list[DP_EVENT_Q_MAX];
spinlock_t event_lock; spinlock_t event_lock;
bool wide_bus_en; bool wide_bus_supported;
struct dp_audio *audio; struct dp_audio *audio;
}; };
...@@ -120,7 +120,7 @@ struct msm_dp_desc { ...@@ -120,7 +120,7 @@ struct msm_dp_desc {
phys_addr_t io_start; phys_addr_t io_start;
unsigned int id; unsigned int id;
unsigned int connector_type; unsigned int connector_type;
bool wide_bus_en; bool wide_bus_supported;
}; };
static const struct msm_dp_desc sc7180_dp_descs[] = { static const struct msm_dp_desc sc7180_dp_descs[] = {
...@@ -129,8 +129,8 @@ static const struct msm_dp_desc sc7180_dp_descs[] = { ...@@ -129,8 +129,8 @@ static const struct msm_dp_desc sc7180_dp_descs[] = {
}; };
static const struct msm_dp_desc sc7280_dp_descs[] = { static const struct msm_dp_desc sc7280_dp_descs[] = {
{ .io_start = 0x0ae90000, .id = MSM_DP_CONTROLLER_0, .connector_type = DRM_MODE_CONNECTOR_DisplayPort, .wide_bus_en = true }, { .io_start = 0x0ae90000, .id = MSM_DP_CONTROLLER_0, .connector_type = DRM_MODE_CONNECTOR_DisplayPort, .wide_bus_supported = true },
{ .io_start = 0x0aea0000, .id = MSM_DP_CONTROLLER_1, .connector_type = DRM_MODE_CONNECTOR_eDP, .wide_bus_en = true }, { .io_start = 0x0aea0000, .id = MSM_DP_CONTROLLER_1, .connector_type = DRM_MODE_CONNECTOR_eDP, .wide_bus_supported = true },
{} {}
}; };
...@@ -142,22 +142,22 @@ static const struct msm_dp_desc sc8180x_dp_descs[] = { ...@@ -142,22 +142,22 @@ static const struct msm_dp_desc sc8180x_dp_descs[] = {
}; };
static const struct msm_dp_desc sc8280xp_dp_descs[] = { static const struct msm_dp_desc sc8280xp_dp_descs[] = {
{ .io_start = 0x0ae90000, .id = MSM_DP_CONTROLLER_0, .connector_type = DRM_MODE_CONNECTOR_DisplayPort, .wide_bus_en = true }, { .io_start = 0x0ae90000, .id = MSM_DP_CONTROLLER_0, .connector_type = DRM_MODE_CONNECTOR_DisplayPort, .wide_bus_supported = true },
{ .io_start = 0x0ae98000, .id = MSM_DP_CONTROLLER_1, .connector_type = DRM_MODE_CONNECTOR_DisplayPort, .wide_bus_en = true }, { .io_start = 0x0ae98000, .id = MSM_DP_CONTROLLER_1, .connector_type = DRM_MODE_CONNECTOR_DisplayPort, .wide_bus_supported = true },
{ .io_start = 0x0ae9a000, .id = MSM_DP_CONTROLLER_2, .connector_type = DRM_MODE_CONNECTOR_DisplayPort, .wide_bus_en = true }, { .io_start = 0x0ae9a000, .id = MSM_DP_CONTROLLER_2, .connector_type = DRM_MODE_CONNECTOR_DisplayPort, .wide_bus_supported = true },
{ .io_start = 0x0aea0000, .id = MSM_DP_CONTROLLER_3, .connector_type = DRM_MODE_CONNECTOR_DisplayPort, .wide_bus_en = true }, { .io_start = 0x0aea0000, .id = MSM_DP_CONTROLLER_3, .connector_type = DRM_MODE_CONNECTOR_DisplayPort, .wide_bus_supported = true },
{ .io_start = 0x22090000, .id = MSM_DP_CONTROLLER_0, .connector_type = DRM_MODE_CONNECTOR_DisplayPort, .wide_bus_en = true }, { .io_start = 0x22090000, .id = MSM_DP_CONTROLLER_0, .connector_type = DRM_MODE_CONNECTOR_DisplayPort, .wide_bus_supported = true },
{ .io_start = 0x22098000, .id = MSM_DP_CONTROLLER_1, .connector_type = DRM_MODE_CONNECTOR_DisplayPort, .wide_bus_en = true }, { .io_start = 0x22098000, .id = MSM_DP_CONTROLLER_1, .connector_type = DRM_MODE_CONNECTOR_DisplayPort, .wide_bus_supported = true },
{ .io_start = 0x2209a000, .id = MSM_DP_CONTROLLER_2, .connector_type = DRM_MODE_CONNECTOR_DisplayPort, .wide_bus_en = true }, { .io_start = 0x2209a000, .id = MSM_DP_CONTROLLER_2, .connector_type = DRM_MODE_CONNECTOR_DisplayPort, .wide_bus_supported = true },
{ .io_start = 0x220a0000, .id = MSM_DP_CONTROLLER_3, .connector_type = DRM_MODE_CONNECTOR_DisplayPort, .wide_bus_en = true }, { .io_start = 0x220a0000, .id = MSM_DP_CONTROLLER_3, .connector_type = DRM_MODE_CONNECTOR_DisplayPort, .wide_bus_supported = true },
{} {}
}; };
static const struct msm_dp_desc sc8280xp_edp_descs[] = { static const struct msm_dp_desc sc8280xp_edp_descs[] = {
{ .io_start = 0x0ae9a000, .id = MSM_DP_CONTROLLER_2, .connector_type = DRM_MODE_CONNECTOR_eDP, .wide_bus_en = true }, { .io_start = 0x0ae9a000, .id = MSM_DP_CONTROLLER_2, .connector_type = DRM_MODE_CONNECTOR_eDP, .wide_bus_supported = true },
{ .io_start = 0x0aea0000, .id = MSM_DP_CONTROLLER_3, .connector_type = DRM_MODE_CONNECTOR_eDP, .wide_bus_en = true }, { .io_start = 0x0aea0000, .id = MSM_DP_CONTROLLER_3, .connector_type = DRM_MODE_CONNECTOR_eDP, .wide_bus_supported = true },
{ .io_start = 0x2209a000, .id = MSM_DP_CONTROLLER_2, .connector_type = DRM_MODE_CONNECTOR_eDP, .wide_bus_en = true }, { .io_start = 0x2209a000, .id = MSM_DP_CONTROLLER_2, .connector_type = DRM_MODE_CONNECTOR_eDP, .wide_bus_supported = true },
{ .io_start = 0x220a0000, .id = MSM_DP_CONTROLLER_3, .connector_type = DRM_MODE_CONNECTOR_eDP, .wide_bus_en = true }, { .io_start = 0x220a0000, .id = MSM_DP_CONTROLLER_3, .connector_type = DRM_MODE_CONNECTOR_eDP, .wide_bus_supported = true },
{} {}
}; };
...@@ -766,9 +766,9 @@ static int dp_init_sub_modules(struct dp_display_private *dp) ...@@ -766,9 +766,9 @@ static int dp_init_sub_modules(struct dp_display_private *dp)
goto error_ctrl; goto error_ctrl;
} }
/* populate wide_bus_en to differernt layers */ /* populate wide_bus_supported to different layers */
dp->ctrl->wide_bus_en = dp->wide_bus_en; dp->ctrl->wide_bus_en = dp->wide_bus_supported;
dp->catalog->wide_bus_en = dp->wide_bus_en; dp->catalog->wide_bus_en = dp->wide_bus_supported;
return rc; return rc;
...@@ -1247,7 +1247,7 @@ static int dp_display_probe(struct platform_device *pdev) ...@@ -1247,7 +1247,7 @@ static int dp_display_probe(struct platform_device *pdev)
dp->name = "drm_dp"; dp->name = "drm_dp";
dp->id = desc->id; dp->id = desc->id;
dp->dp_display.connector_type = desc->connector_type; dp->dp_display.connector_type = desc->connector_type;
dp->wide_bus_en = desc->wide_bus_en; dp->wide_bus_supported = desc->wide_bus_supported;
dp->dp_display.is_edp = dp->dp_display.is_edp =
(dp->dp_display.connector_type == DRM_MODE_CONNECTOR_eDP); (dp->dp_display.connector_type == DRM_MODE_CONNECTOR_eDP);
...@@ -1381,7 +1381,7 @@ bool msm_dp_wide_bus_available(const struct msm_dp *dp_display) ...@@ -1381,7 +1381,7 @@ bool msm_dp_wide_bus_available(const struct msm_dp *dp_display)
dp = container_of(dp_display, struct dp_display_private, dp_display); dp = container_of(dp_display, struct dp_display_private, dp_display);
return dp->wide_bus_en; return dp->wide_bus_supported;
} }
void dp_display_debugfs_init(struct msm_dp *dp_display, struct dentry *root, bool is_edp) void dp_display_debugfs_init(struct msm_dp *dp_display, struct dentry *root, bool is_edp)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7