Commit 0fbe7c7d authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/mdss: correct UBWC programming for SM8550 



The SM8550 platform employs newer UBWC decoder, which requires slightly
different programming.

Fixes: a2f33995 ("drm/msm: mdss: add support for SM8550")
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/550049/
Link: https://lore.kernel.org/r/20230728213320.97309-2-dmitry.baryshkov@linaro.org
parent edb34ac1

drivers/gpu/drm/msm/msm_mdss.c

+17 −2
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ static int _msm_mdss_irq_domain_add(struct msm_mdss *msm_mdss) 
#define UBWC_2_0 0x20000000

#define UBWC_3_0 0x30000000

#define UBWC_4_0 0x40000000

#define UBWC_4_3 0x40030000



static void msm_mdss_setup_ubwc_dec_20(struct msm_mdss *msm_mdss)

{
@@ -227,6 +228,9 @@ static void msm_mdss_setup_ubwc_dec_40(struct msm_mdss *msm_mdss) 
		writel_relaxed(1, msm_mdss->mmio + UBWC_CTRL_2);

		writel_relaxed(0, msm_mdss->mmio + UBWC_PREDICTION_MODE);

	} else {

		if (data->ubwc_dec_version == UBWC_4_3)

			writel_relaxed(3, msm_mdss->mmio + UBWC_CTRL_2);

		else

			writel_relaxed(2, msm_mdss->mmio + UBWC_CTRL_2);

		writel_relaxed(1, msm_mdss->mmio + UBWC_PREDICTION_MODE);

	}
@@ -271,6 +275,7 @@ static int msm_mdss_enable(struct msm_mdss *msm_mdss) 
		msm_mdss_setup_ubwc_dec_30(msm_mdss);

		break;

	case UBWC_4_0:

	case UBWC_4_3:

		msm_mdss_setup_ubwc_dec_40(msm_mdss);

		break;

	default:
@@ -576,6 +581,16 @@ static const struct msm_mdss_data sm8250_data = { 
	.macrotile_mode = 1,

};



static const struct msm_mdss_data sm8550_data = {

	.ubwc_version = UBWC_4_0,

	.ubwc_dec_version = UBWC_4_3,

	.ubwc_swizzle = 6,

	.ubwc_static = 1,

	/* TODO: highest_bank_bit = 2 for LP_DDR4 */

	.highest_bank_bit = 3,

	.macrotile_mode = 1,

};



static const struct of_device_id mdss_dt_match[] = {

	{ .compatible = "qcom,mdss" },

	{ .compatible = "qcom,msm8998-mdss" },
@@ -593,7 +608,7 @@ static const struct of_device_id mdss_dt_match[] = { 
	{ .compatible = "qcom,sm8250-mdss", .data = &sm8250_data },

	{ .compatible = "qcom,sm8350-mdss", .data = &sm8250_data },

	{ .compatible = "qcom,sm8450-mdss", .data = &sm8250_data },

	{ .compatible = "qcom,sm8550-mdss", .data = &sm8250_data },

	{ .compatible = "qcom,sm8550-mdss", .data = &sm8550_data },

	{}

};

MODULE_DEVICE_TABLE(of, mdss_dt_match);