[PATCH 0/4] soc: qcom: ubwc: more fixes and missing platforms

[PATCH 0/4] soc: qcom: ubwc: more fixes and missing platforms

[Dmitry Baryshkov]

Add missing configuration for several platforms and correct
configuration for several other platforms.

Note: I'm not sure how to handle MSM8956/76 platforms. MDSS definitely
doesn't have UBWC support. This doesn't provide a threat for now (as
MDP5 driver doesn't provide UBWC support), but if we were to switch
these platforms to the DPU driver, we might need to filter them out.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
---
Dmitry Baryshkov (4):
      soc: qcom: ubwc: use no-uwbc config for MSM8917
      soc: qcom: ubwc: add more missing platforms
      soc: qcom: add configuration for MSM8929
      soc: qcom: use no-UBWC config for MSM8956/76

 drivers/soc/qcom/ubwc_config.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
---
base-commit: 0b6974bb4134ca6396752a0b122026b41300592f
change-id: 20250814-more-ubwc-d56e4bccc23d

Best regards,
-- 
With best wishes
Dmitry

[PATCH 1/4] soc: qcom: ubwc: use no-uwbc config for MSM8917

[Dmitry Baryshkov]

MSM8917 has MDSS 1.15 and Adreno 308, neither of which support UBWC.
Change UBWC configuration to point out that UBWC is not supported on
this platform.

Fixes: 1924272b9ce1 ("soc: qcom: Add UBWC config provider")
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
---
 drivers/soc/qcom/ubwc_config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/soc/qcom/ubwc_config.c b/drivers/soc/qcom/ubwc_config.c
index 1490a7f63767bba176e8e2e76891d7d2c424bb7f..5113c2902bf2ba3711bb14b35bbbb8a2b49b8cfe 100644
--- a/drivers/soc/qcom/ubwc_config.c
+++ b/drivers/soc/qcom/ubwc_config.c
@@ -225,7 +225,7 @@ static const struct of_device_id qcom_ubwc_configs[] __maybe_unused = {
 	{ .compatible = "qcom,apq8096", .data = &msm8998_data },
 	{ .compatible = "qcom,msm8226", .data = &no_ubwc_data },
 	{ .compatible = "qcom,msm8916", .data = &no_ubwc_data },
-	{ .compatible = "qcom,msm8917", .data = &msm8937_data },
+	{ .compatible = "qcom,msm8917", .data = &no_ubwc_data },
 	{ .compatible = "qcom,msm8937", .data = &msm8937_data },
 	{ .compatible = "qcom,msm8939", .data = &no_ubwc_data },
 	{ .compatible = "qcom,msm8953", .data = &msm8937_data },

-- 
2.47.2

Re: [PATCH 1/4] soc: qcom: ubwc: use no-uwbc config for MSM8917

[Konrad Dybcio]

On 8/14/25 9:22 AM, Dmitry Baryshkov wrote:
> MSM8917 has MDSS 1.15 and Adreno 308, neither of which support UBWC.
> Change UBWC configuration to point out that UBWC is not supported on
> this platform.
> 
> Fixes: 1924272b9ce1 ("soc: qcom: Add UBWC config provider")
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> ---
>  drivers/soc/qcom/ubwc_config.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/soc/qcom/ubwc_config.c b/drivers/soc/qcom/ubwc_config.c
> index 1490a7f63767bba176e8e2e76891d7d2c424bb7f..5113c2902bf2ba3711bb14b35bbbb8a2b49b8cfe 100644
> --- a/drivers/soc/qcom/ubwc_config.c
> +++ b/drivers/soc/qcom/ubwc_config.c
> @@ -225,7 +225,7 @@ static const struct of_device_id qcom_ubwc_configs[] __maybe_unused = {
>  	{ .compatible = "qcom,apq8096", .data = &msm8998_data },
>  	{ .compatible = "qcom,msm8226", .data = &no_ubwc_data },
>  	{ .compatible = "qcom,msm8916", .data = &no_ubwc_data },
> -	{ .compatible = "qcom,msm8917", .data = &msm8937_data },
> +	{ .compatible = "qcom,msm8917", .data = &no_ubwc_data },

https://android.googlesource.com/kernel/msm/+/android-7.1.0_r0.2/arch/arm/boot/dts/qcom/msm8917-mdss.dtsi#93

&mdss_rotator {
	/delete-property/ qcom,mdss-has-ubwc;
};

argh! thanks for catching that

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

Konrad

[PATCH 2/4] soc: qcom: ubwc: add more missing platforms

[Dmitry Baryshkov]

Add UBWC configuration for SDA660 (modem-less variant of SDM660), SDM450
(similar to MSM8953), SDM632 (similar to MSM8953) and SM7325 (similar to
SC7280).

Fixes: 1924272b9ce1 ("soc: qcom: Add UBWC config provider")
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
---
 drivers/soc/qcom/ubwc_config.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/soc/qcom/ubwc_config.c b/drivers/soc/qcom/ubwc_config.c
index 5113c2902bf2ba3711bb14b35bbbb8a2b49b8cfe..8b23b4d4e3989a7170a9f44f3a5e466cffd70157 100644
--- a/drivers/soc/qcom/ubwc_config.c
+++ b/drivers/soc/qcom/ubwc_config.c
@@ -244,7 +244,10 @@ static const struct of_device_id qcom_ubwc_configs[] __maybe_unused = {
 	{ .compatible = "qcom,sc7280", .data = &sc7280_data, },
 	{ .compatible = "qcom,sc8180x", .data = &sc8180x_data, },
 	{ .compatible = "qcom,sc8280xp", .data = &sc8280xp_data, },
+	{ .compatible = "qcom,sda660", .data = &msm8937_data },
+	{ .compatible = "qcom,sdm450", .data = &msm8937_data },
 	{ .compatible = "qcom,sdm630", .data = &msm8937_data },
+	{ .compatible = "qcom,sdm632", .data = &msm8937_data },
 	{ .compatible = "qcom,sdm636", .data = &msm8937_data },
 	{ .compatible = "qcom,sdm660", .data = &msm8937_data },
 	{ .compatible = "qcom,sdm670", .data = &sdm670_data, },
@@ -258,6 +261,7 @@ static const struct of_device_id qcom_ubwc_configs[] __maybe_unused = {
 	{ .compatible = "qcom,sm7125", .data = &sc7180_data },
 	{ .compatible = "qcom,sm7150", .data = &sm7150_data, },
 	{ .compatible = "qcom,sm7225", .data = &sm6350_data, },
+	{ .compatible = "qcom,sm7325", .data = &sc7280_data, },
 	{ .compatible = "qcom,sm8150", .data = &sm8150_data, },
 	{ .compatible = "qcom,sm8250", .data = &sm8250_data, },
 	{ .compatible = "qcom,sm8350", .data = &sm8350_data, },

-- 
2.47.2

Re: [PATCH 2/4] soc: qcom: ubwc: add more missing platforms

[Konrad Dybcio]

On 8/14/25 9:22 AM, Dmitry Baryshkov wrote:
> Add UBWC configuration for SDA660 (modem-less variant of SDM660), SDM450
> (similar to MSM8953), SDM632 (similar to MSM8953) and SM7325 (similar to
> SC7280).
> 
> Fixes: 1924272b9ce1 ("soc: qcom: Add UBWC config provider")
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> ---

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

Konrad

[PATCH 3/4] soc: qcom: add configuration for MSM8929

[Dmitry Baryshkov]

MSM8929 is similar to MSM8939, it doesn't support UBWC. Provide no-UBWC
config for the platform.

Fixes: 197713d0cf01 ("soc: qcom: ubwc: provide no-UBWC configuration")
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
---
 drivers/soc/qcom/ubwc_config.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/soc/qcom/ubwc_config.c b/drivers/soc/qcom/ubwc_config.c
index 8b23b4d4e3989a7170a9f44f3a5e466cffd70157..689e333ae44308cec178ff343bf09cc89bf9fce4 100644
--- a/drivers/soc/qcom/ubwc_config.c
+++ b/drivers/soc/qcom/ubwc_config.c
@@ -227,6 +227,7 @@ static const struct of_device_id qcom_ubwc_configs[] __maybe_unused = {
 	{ .compatible = "qcom,msm8916", .data = &no_ubwc_data },
 	{ .compatible = "qcom,msm8917", .data = &no_ubwc_data },
 	{ .compatible = "qcom,msm8937", .data = &msm8937_data },
+	{ .compatible = "qcom,msm8929", .data = &no_ubwc_data },
 	{ .compatible = "qcom,msm8939", .data = &no_ubwc_data },
 	{ .compatible = "qcom,msm8953", .data = &msm8937_data },
 	{ .compatible = "qcom,msm8956", .data = &msm8937_data },

-- 
2.47.2

Re: [PATCH 3/4] soc: qcom: add configuration for MSM8929

[Konrad Dybcio]

On 8/14/25 9:22 AM, Dmitry Baryshkov wrote:
> MSM8929 is similar to MSM8939, it doesn't support UBWC. Provide no-UBWC
> config for the platform.
> 
> Fixes: 197713d0cf01 ("soc: qcom: ubwc: provide no-UBWC configuration")
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> ---

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

Konrad

[PATCH 4/4] soc: qcom: use no-UBWC config for MSM8956/76

[Dmitry Baryshkov]

Both MSM8956 and MSM8976 have MDSS 1.11 which doesn't support UBWC
(although they also have Adreno 510, which might support UBWC). Disable
UBWC support for those platforms.

Fixes: 1924272b9ce1 ("soc: qcom: Add UBWC config provider")
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
---
 drivers/soc/qcom/ubwc_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/soc/qcom/ubwc_config.c b/drivers/soc/qcom/ubwc_config.c
index 689e333ae44308cec178ff343bf09cc89bf9fce4..15d373bff231d770e00fe0aee1b5a95c7b8a6305 100644
--- a/drivers/soc/qcom/ubwc_config.c
+++ b/drivers/soc/qcom/ubwc_config.c
@@ -230,9 +230,9 @@ static const struct of_device_id qcom_ubwc_configs[] __maybe_unused = {
 	{ .compatible = "qcom,msm8929", .data = &no_ubwc_data },
 	{ .compatible = "qcom,msm8939", .data = &no_ubwc_data },
 	{ .compatible = "qcom,msm8953", .data = &msm8937_data },
-	{ .compatible = "qcom,msm8956", .data = &msm8937_data },
+	{ .compatible = "qcom,msm8956", .data = &no_ubwc_data },
 	{ .compatible = "qcom,msm8974", .data = &no_ubwc_data },
-	{ .compatible = "qcom,msm8976", .data = &msm8937_data },
+	{ .compatible = "qcom,msm8976", .data = &no_ubwc_data },
 	{ .compatible = "qcom,msm8996", .data = &msm8998_data },
 	{ .compatible = "qcom,msm8998", .data = &msm8998_data },
 	{ .compatible = "qcom,qcm2290", .data = &qcm2290_data, },

-- 
2.47.2

Re: [PATCH 4/4] soc: qcom: use no-UBWC config for MSM8956/76

[Konrad Dybcio]

On 8/14/25 9:22 AM, Dmitry Baryshkov wrote:
> Both MSM8956 and MSM8976 have MDSS 1.11 which doesn't support UBWC
> (although they also have Adreno 510, which might support UBWC). Disable
> UBWC support for those platforms.
> 
> Fixes: 1924272b9ce1 ("soc: qcom: Add UBWC config provider")
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> ---

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

Konrad

Re: [PATCH 4/4] soc: qcom: use no-UBWC config for MSM8956/76

[Dmitry Baryshkov]

On Thu, Aug 14, 2025 at 11:25:16AM +0200, Konrad Dybcio wrote:
> On 8/14/25 9:22 AM, Dmitry Baryshkov wrote:
> > Both MSM8956 and MSM8976 have MDSS 1.11 which doesn't support UBWC
> > (although they also have Adreno 510, which might support UBWC). Disable
> > UBWC support for those platforms.
> > 
> > Fixes: 1924272b9ce1 ("soc: qcom: Add UBWC config provider")
> > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> > ---
> 
> Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

I've posted this patch, but I'm a bit reluctant to merge it. These
targets should be able to use UBWC for GPU work, but then rewert to
linear for scanout buffers.

-- 
With best wishes
Dmitry

Re: [PATCH 0/4] soc: qcom: ubwc: more fixes and missing platforms

[Bjorn Andersson]

On Thu, Aug 14, 2025 at 10:22:19AM +0300, Dmitry Baryshkov wrote:
> Add missing configuration for several platforms and correct
> configuration for several other platforms.
> 
> Note: I'm not sure how to handle MSM8956/76 platforms. MDSS definitely
> doesn't have UBWC support. This doesn't provide a threat for now (as
> MDP5 driver doesn't provide UBWC support), but if we were to switch
> these platforms to the DPU driver, we might need to filter them out.
> 
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>

Acked-by: Bjorn Andersson <andersson@kernel.org>

Regards,
Bjorn

> ---
> Dmitry Baryshkov (4):
>       soc: qcom: ubwc: use no-uwbc config for MSM8917
>       soc: qcom: ubwc: add more missing platforms
>       soc: qcom: add configuration for MSM8929
>       soc: qcom: use no-UBWC config for MSM8956/76
> 
>  drivers/soc/qcom/ubwc_config.c | 11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
> ---
> base-commit: 0b6974bb4134ca6396752a0b122026b41300592f
> change-id: 20250814-more-ubwc-d56e4bccc23d
> 
> Best regards,
> -- 
> With best wishes
> Dmitry
>