From: Yuanjie Yang <[email protected]>

Add mdss support for the Qualcomm Kaanapali platform.

Co-developed-by: Yongxing Mou <[email protected]>
Signed-off-by: Yongxing Mou <[email protected]>
Signed-off-by: Yuanjie Yang <[email protected]>
---
 drivers/gpu/drm/msm/msm_mdss.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/msm/msm_mdss.c b/drivers/gpu/drm/msm/msm_mdss.c
index bf9a33e925ac..cd330870a6fb 100644
--- a/drivers/gpu/drm/msm/msm_mdss.c
+++ b/drivers/gpu/drm/msm/msm_mdss.c
@@ -239,7 +239,11 @@ static void msm_mdss_setup_ubwc_dec_50(struct msm_mdss 
*msm_mdss)
 
        writel_relaxed(value, msm_mdss->mmio + REG_MDSS_UBWC_STATIC);
 
-       writel_relaxed(4, msm_mdss->mmio + REG_MDSS_UBWC_CTRL_2);
+       if (data->ubwc_dec_version == UBWC_5_0)
+               writel_relaxed(4, msm_mdss->mmio + REG_MDSS_UBWC_CTRL_2);
+       else
+               writel_relaxed(5, msm_mdss->mmio + REG_MDSS_UBWC_CTRL_2);
+
        writel_relaxed(1, msm_mdss->mmio + REG_MDSS_UBWC_PREDICTION_MODE);
 }
 
@@ -296,6 +300,9 @@ static int msm_mdss_enable(struct msm_mdss *msm_mdss)
        case UBWC_5_0:
                msm_mdss_setup_ubwc_dec_50(msm_mdss);
                break;
+       case UBWC_6_0:
+               msm_mdss_setup_ubwc_dec_50(msm_mdss);
+               break;
        default:
                dev_err(msm_mdss->dev, "Unsupported UBWC decoder version %x\n",
                        msm_mdss->mdss_data->ubwc_dec_version);
@@ -552,6 +559,7 @@ static const struct msm_mdss_data data_153k6 = {
 };
 
 static const struct of_device_id mdss_dt_match[] = {
+       { .compatible = "qcom,kaanapali-mdss", .data = &data_57k },
        { .compatible = "qcom,mdss", .data = &data_153k6 },
        { .compatible = "qcom,glymur-mdss", .data = &data_57k },
        { .compatible = "qcom,msm8998-mdss", .data = &data_76k8 },
-- 
2.34.1

Reply via email to