On 24-04-05 20:14:11, Bjorn Andersson wrote: > Now that the connector_type is dynamically determined, the > connector_type of the struct msm_dp_desc is unused. Clean it up. > > Remaining duplicate entries are squashed. > > Signed-off-by: Bjorn Andersson <quic_bjorande@xxxxxxxxxxx> Reviewed-by: Abel Vesa <abel.vesa@xxxxxxxxxx> > --- > This cleans up after, and hence depends on, > https://lore.kernel.org/all/20240324-x1e80100-display-refactor-connector-v4-1-e0ebaea66a78@xxxxxxxxxx/ > --- > Changes in v2: > - Squashed now duplicate entries > - Link to v1: https://lore.kernel.org/r/20240328-dp-connector-type-cleanup-v1-1-9bf84c5a6082@xxxxxxxxxxx > --- > drivers/gpu/drm/msm/dp/dp_display.c | 48 +++++++++++++------------------------ > 1 file changed, 17 insertions(+), 31 deletions(-) > > diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c > index 521cba76d2a0..12c01625c551 100644 > --- a/drivers/gpu/drm/msm/dp/dp_display.c > +++ b/drivers/gpu/drm/msm/dp/dp_display.c > @@ -119,55 +119,41 @@ 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 }, > - {} > -}; > - > -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_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 }, > - {} > -}; > - > -static const struct msm_dp_desc sm8350_dp_descs[] = { > - { .io_start = 0x0ae90000, .id = MSM_DP_CONTROLLER_0, .connector_type = DRM_MODE_CONNECTOR_DisplayPort }, > + { .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 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 }, > {} > }; > > @@ -186,9 +172,9 @@ static const struct of_device_id dp_dt_match[] = { > { .compatible = "qcom,sc8180x-dp", .data = &sc8180x_dp_descs }, > { .compatible = "qcom,sc8180x-edp", .data = &sc8180x_dp_descs }, > { .compatible = "qcom,sc8280xp-dp", .data = &sc8280xp_dp_descs }, > - { .compatible = "qcom,sc8280xp-edp", .data = &sc8280xp_edp_descs }, > + { .compatible = "qcom,sc8280xp-edp", .data = &sc8280xp_dp_descs }, > { .compatible = "qcom,sdm845-dp", .data = &sc7180_dp_descs }, > - { .compatible = "qcom,sm8350-dp", .data = &sm8350_dp_descs }, > + { .compatible = "qcom,sm8350-dp", .data = &sc7180_dp_descs }, > { .compatible = "qcom,sm8650-dp", .data = &sm8650_dp_descs }, > { .compatible = "qcom,x1e80100-dp", .data = &x1e80100_dp_descs }, > {} > > --- > base-commit: a874b50929e2596deeeeaf21d09f1561a7c59537 > change-id: 20240328-dp-connector-type-cleanup-af6501e374b3 > > Best regards, > -- > Bjorn Andersson <quic_bjorande@xxxxxxxxxxx> >
