On Fri, 29 Mar 2024 at 06:02, Bjorn Andersson <[email protected]> wrote:
>
> Now that the connector_type is dynamically determined, the
> connector_type of the struct msm_dp_desc is unused. Clean it up.
>
> Signed-off-by: Bjorn Andersson <[email protected]>
> ---
> This cleans up after, and hence depends on,
> https://lore.kernel.org/all/20240324-x1e80100-display-refactor-connector-v4-1-e0ebaea66...@linaro.org/
> ---
> drivers/gpu/drm/msm/dp/dp_display.c | 41
> ++++++++++++++++++-------------------
> 1 file changed, 20 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/dp/dp_display.c
> b/drivers/gpu/drm/msm/dp/dp_display.c
> index 521cba76d2a0..a18fb8b32c16 100644
> --- a/drivers/gpu/drm/msm/dp/dp_display.c
> +++ b/drivers/gpu/drm/msm/dp/dp_display.c
> @@ -119,55 +119,54 @@ struct dp_display_private {
> struct msm_dp_desc {
> phys_addr_t io_start;
> unsigned int id;
> - unsigned int connector_type;
> bool wide_bus_supported;
> };
>
> static const struct msm_dp_desc sc7180_dp_descs[] = {
> - { .io_start = 0x0ae90000, .id = MSM_DP_CONTROLLER_0, .connector_type
> = DRM_MODE_CONNECTOR_DisplayPort },
> + { .io_start = 0x0ae90000, .id = MSM_DP_CONTROLLER_0 },
> {}
> };
>
> 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_supported = true },
> - { .io_start = 0x0aea0000, .id = MSM_DP_CONTROLLER_1, .connector_type
> = DRM_MODE_CONNECTOR_eDP, .wide_bus_supported = true },
> + { .io_start = 0x0ae90000, .id = MSM_DP_CONTROLLER_0,
> .wide_bus_supported = true },
> + { .io_start = 0x0aea0000, .id = MSM_DP_CONTROLLER_1,
> .wide_bus_supported = true },
> {}
> };
>
> static const struct msm_dp_desc sc8180x_dp_descs[] = {
> - { .io_start = 0x0ae90000, .id = MSM_DP_CONTROLLER_0, .connector_type
> = DRM_MODE_CONNECTOR_DisplayPort },
> - { .io_start = 0x0ae98000, .id = MSM_DP_CONTROLLER_1, .connector_type
> = DRM_MODE_CONNECTOR_DisplayPort },
> - { .io_start = 0x0ae9a000, .id = MSM_DP_CONTROLLER_2, .connector_type
> = DRM_MODE_CONNECTOR_eDP },
> + { .io_start = 0x0ae90000, .id = MSM_DP_CONTROLLER_0 },
> + { .io_start = 0x0ae98000, .id = MSM_DP_CONTROLLER_1 },
> + { .io_start = 0x0ae9a000, .id = MSM_DP_CONTROLLER_2 },
> {}
> };
>
> 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_supported = 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_supported = 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_supported = 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_supported = true },
> - { .io_start = 0x220a0000, .id = MSM_DP_CONTROLLER_3, .connector_type
> = DRM_MODE_CONNECTOR_DisplayPort, .wide_bus_supported = true },
> + { .io_start = 0x0ae90000, .id = MSM_DP_CONTROLLER_0,
> .wide_bus_supported = true },
> + { .io_start = 0x0ae98000, .id = MSM_DP_CONTROLLER_1,
> .wide_bus_supported = true },
> + { .io_start = 0x0ae9a000, .id = MSM_DP_CONTROLLER_2,
> .wide_bus_supported = true },
> + { .io_start = 0x0aea0000, .id = MSM_DP_CONTROLLER_3,
> .wide_bus_supported = true },
> + { .io_start = 0x22090000, .id = MSM_DP_CONTROLLER_0,
> .wide_bus_supported = true },
> + { .io_start = 0x22098000, .id = MSM_DP_CONTROLLER_1,
> .wide_bus_supported = true },
> + { .io_start = 0x2209a000, .id = MSM_DP_CONTROLLER_2,
> .wide_bus_supported = true },
> + { .io_start = 0x220a0000, .id = MSM_DP_CONTROLLER_3,
> .wide_bus_supported = true },
> {}
> };
>
> static const struct msm_dp_desc sc8280xp_edp_descs[] = {
This can now be merged with sc8280xp_dp_descs
> - { .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_supported = 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_supported = true },
> + { .io_start = 0x0ae9a000, .id = MSM_DP_CONTROLLER_2,
> .wide_bus_supported = true },
> + { .io_start = 0x0aea0000, .id = MSM_DP_CONTROLLER_3,
> .wide_bus_supported = true },
> + { .io_start = 0x2209a000, .id = MSM_DP_CONTROLLER_2,
> .wide_bus_supported = true },
> + { .io_start = 0x220a0000, .id = MSM_DP_CONTROLLER_3,
> .wide_bus_supported = true },
> {}
> };
>
> static const struct msm_dp_desc sm8350_dp_descs[] = {
same as sc7180_dp
> - { .io_start = 0x0ae90000, .id = MSM_DP_CONTROLLER_0, .connector_type
> = DRM_MODE_CONNECTOR_DisplayPort },
> + { .io_start = 0x0ae90000, .id = MSM_DP_CONTROLLER_0 },
> {}
> };
>
> static const struct msm_dp_desc sm8650_dp_descs[] = {
> - { .io_start = 0x0af54000, .id = MSM_DP_CONTROLLER_0, .connector_type
> = DRM_MODE_CONNECTOR_DisplayPort },
> + { .io_start = 0x0af54000, .id = MSM_DP_CONTROLLER_0 },
> {}
> };
>
--
With best wishes
Dmitry
