Skip to content

Commit 83c4c67

Browse files
James A. MacInneslumag
authored andcommitted
drm/msm/dp: Disable wide bus support for SDM845
When widebus was enabled for DisplayPort in commit c7c4122 ("drm/msm/dp: enable widebus on all relevant chipsets") it was clarified that it is only supported on DPU 5.0.0 onwards which includes SC7180 on DPU revision 6.2. However, this patch missed that the description structure for SC7180 is also reused for SDM845 (because of identical io_start address) which is only DPU 4.0.0, leading to a wrongly enbled widebus feature and corruption on that platform. Create a separate msm_dp_desc_sdm845 structure for this SoC compatible, with the wide_bus_supported flag turned off. Fixes: c7c4122 ("drm/msm/dp: enable widebus on all relevant chipsets") Signed-off-by: James A. MacInnes <[email protected]> [DB: reworded commit text following Marijn's suggestion] Reviewed-by: Abhinav Kumar <[email protected]> Reviewed-by: Dmitry Baryshkov <[email protected]> Patchwork: https://patchwork.freedesktop.org/patch/636944/ Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Dmitry Baryshkov <[email protected]>
1 parent ee11d95 commit 83c4c67

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

drivers/gpu/drm/msm/dp/dp_display.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,11 @@ static const struct msm_dp_desc msm_dp_desc_sa8775p[] = {
128128
{}
129129
};
130130

131+
static const struct msm_dp_desc msm_dp_desc_sdm845[] = {
132+
{ .io_start = 0x0ae90000, .id = MSM_DP_CONTROLLER_0 },
133+
{}
134+
};
135+
131136
static const struct msm_dp_desc msm_dp_desc_sc7180[] = {
132137
{ .io_start = 0x0ae90000, .id = MSM_DP_CONTROLLER_0, .wide_bus_supported = true },
133138
{}
@@ -180,7 +185,7 @@ static const struct of_device_id msm_dp_dt_match[] = {
180185
{ .compatible = "qcom,sc8180x-edp", .data = &msm_dp_desc_sc8180x },
181186
{ .compatible = "qcom,sc8280xp-dp", .data = &msm_dp_desc_sc8280xp },
182187
{ .compatible = "qcom,sc8280xp-edp", .data = &msm_dp_desc_sc8280xp },
183-
{ .compatible = "qcom,sdm845-dp", .data = &msm_dp_desc_sc7180 },
188+
{ .compatible = "qcom,sdm845-dp", .data = &msm_dp_desc_sdm845 },
184189
{ .compatible = "qcom,sm8350-dp", .data = &msm_dp_desc_sc7180 },
185190
{ .compatible = "qcom,sm8650-dp", .data = &msm_dp_desc_sm8650 },
186191
{ .compatible = "qcom,x1e80100-dp", .data = &msm_dp_desc_x1e80100 },

0 commit comments

Comments
 (0)