Commit 42d0d253 authored by Jonathan Marek's avatar Jonathan Marek Committed by Dmitry Baryshkov
Browse files

drm/msm/dpu: increase memtype count to 16 for sm8550 



sm8550 has 16 vbif clients.

This fixes the extra 2 clients (DMA4/DMA5) not having their memtype
initialized. This fixes DMA4/DMA5 planes not displaying correctly.

Fixes: efcd0107 ("drm/msm/dpu: add support for SM8550")
Signed-off-by: default avatarJonathan Marek <jonathan@marek.ca>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8550-QRD
Patchwork: https://patchwork.freedesktop.org/patch/550968/
Link: https://lore.kernel.org/r/20230802134900.30435-1-jonathan@marek.ca


[DB: fixed the Fixes tag]
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent 3d5199a1

drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h

+2 −2
Original line number Diff line number Diff line
@@ -440,8 +440,8 @@ const struct dpu_mdss_cfg dpu_sm8550_cfg = { 
	.merge_3d = sm8550_merge_3d,

	.intf_count = ARRAY_SIZE(sm8550_intf),

	.intf = sm8550_intf,

	.vbif_count = ARRAY_SIZE(sdm845_vbif),

	.vbif = sdm845_vbif,

	.vbif_count = ARRAY_SIZE(sm8550_vbif),

	.vbif = sm8550_vbif,

	.perf = &sm8550_perf_data,

};

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c

+20 −0
Original line number Diff line number Diff line
@@ -539,6 +539,26 @@ static const struct dpu_vbif_cfg sdm845_vbif[] = { 
	},

};



static const struct dpu_vbif_cfg sm8550_vbif[] = {

	{

	.name = "vbif_rt", .id = VBIF_RT,

	.base = 0, .len = 0x1040,

	.features = BIT(DPU_VBIF_QOS_REMAP),

	.xin_halt_timeout = 0x4000,

	.qos_rp_remap_size = 0x40,

	.qos_rt_tbl = {

		.npriority_lvl = ARRAY_SIZE(sdm845_rt_pri_lvl),

		.priority_lvl = sdm845_rt_pri_lvl,

		},

	.qos_nrt_tbl = {

		.npriority_lvl = ARRAY_SIZE(sdm845_nrt_pri_lvl),

		.priority_lvl = sdm845_nrt_pri_lvl,

		},

	.memtype_count = 16,

	.memtype = {3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3},

	},

};



/*************************************************************

 * PERF data config

 *************************************************************/