From nobody Thu Apr 2 17:18:16 2026 Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8766E34F24B for ; Fri, 27 Mar 2026 16:12:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774627964; cv=none; b=iihUxxQ6P+7IJ0rCeXP6hX1ouabn+XtTD1FIxMwBY6e0mVkW5lDhIKbaLflVTkW/EAVfEtzG7eqonlctOxl4YSsFbf1dkx2O/GZEXa7m6PBKjhrK3LsQ04avLXT4NzVwqVQf9H5UDLXdjK/JDoDK0Pf31HaV7GzpBZG3rm30XGE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774627964; c=relaxed/simple; bh=iKsxeLMALhkJyLMhTvLyLfN9d/jMx3vnocKrUpXfqKI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Lswa5otCdXl3XXwsLAaHOmSANp2YUM4/8HlVm41yYSwp0mcyEpIQ7iFnPk58GlShCcH7ELCznCfIbr8SdaUB82DzaREKKGIY3Fr4BxHqMUeScbxGTWNfCXvrlctiVGmh9WLmQy9C7WuKrVlAMS5/+qZrN43Qtenlc0cNcTwY1Q0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=fairphone.com; spf=pass smtp.mailfrom=fairphone.com; dkim=pass (2048-bit key) header.d=fairphone.com header.i=@fairphone.com header.b=MXG9z9LG; arc=none smtp.client-ip=209.85.218.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=fairphone.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fairphone.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fairphone.com header.i=@fairphone.com header.b="MXG9z9LG" Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-b97ed4ad579so373950666b.3 for ; Fri, 27 Mar 2026 09:12:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1774627960; x=1775232760; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=48VlatUV+GiIhWyM6foZDkKT11onjwwumD31krhzoJ4=; b=MXG9z9LGIqRI8VCqFTLT8eba6EDK7pJnLN6wc0xWpkpYfveR0b25fVXMKxFVQSM47L aMxRKqZIypgOioSU2gD+SF+5rByWQbAH9USTvOUUBiXGLtY85ud/nWf1RDQKifElABXU THnYf5FhYFYfBrQRVhnBK3gXzWqUbVjkZPCrYceV6NBT/ZyANnVvrfDGA90iHEE7plhT RnP+mk8fwIDvO2xdVlqJSaQhcmNwLCq/dYqTu/W04naWDvHVdBEinqMt/6Yag+cowJb1 4xoFxrziMZrkqGJ1ZNTy84wMisCAjIZ+sqQCsh6cvIyh3pARoW3r6M2znXjG6h65bSGD f9ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774627960; x=1775232760; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=48VlatUV+GiIhWyM6foZDkKT11onjwwumD31krhzoJ4=; b=duaIwCoiSUr2E8pLZmS3Ev5PR51TYCAMjIwqDLfZyRvUbtp6EX21bHigYJ42xoBz8h Q4letLpRoPz3uCi3+GX0Ma/sejg+g+1xP+5BeEFHiodyghGEevkbiNwZ36DEYVhIKltI Hn3OtzpePTkiN0mYqduJIxYpKLOpBQjfCH/er3j956pN4mv6IxZc8aYx7kkVTTu9LTeK fLmhDX1a+tDbefDuddHXWgDhWPJI6tbiRfI//HXmhCTD6KhYo2FxZ0deAyk+KOjTQE5C LiZdNSavuiTdfAr8YuaQCSDFsnbbUbKfNUd5RP/aNS4jU9plM7xgKkG2P17Dg4HpnGlr KsiA== X-Forwarded-Encrypted: i=1; AJvYcCWUb6LoZ9tKa0aqReX8fIK1tRwF2NTcS5mPiRQrVwq/184c/WNuGk5l9VfeTEGRZQzXkSnGN+WT3CjH/OA=@vger.kernel.org X-Gm-Message-State: AOJu0Yz78AFHTFE+Y6QVxsjKdsxXFolgUdlOjEJJHX4kuv6vAHLZL+lc LUicPTlfyBP2UhENqyk/V+bZnEHPSY61T05qTkk3NaTkQPBGVXwxbOnmd7tWCCWam3A= X-Gm-Gg: ATEYQzygctWQmel5JTQIkDcR93j/ecu76lN9p2DfAmpT4SYOCPCz3eaVKOZW33UhP6L xZ+qtdFUkcyUqsEacBL4V23BwwF6afYrkWYpne13agBrUZPtsxZpEleIk60PmtcxZDteZ/FNerb PqoDMi7bdh388IgB1BXxhj7SgQk9d2a/Da0eWgUy6cc3cqb2cOUkYge12HsJAWTu4u21s7caRFd OeEIjkAK7UnVtf1bquzbXutTtNwNuAd1kkBSp5HgufGXyawjI19x3HX6sRZ0Df2W9H7N2afJpnW HhT/E3jopm2BPvnuE47k+iB/cMzLiBKA3atidz2IEs435ffujVhQG/oj6///0IM/mGTVgpcuAFL imX6BSf7L6wnltJVfWnVZdY3dIZR7r7rW2WblIWgmqYMLgtqHRre1MpCFY0ORsseOi9xgjhMbHj fCX4904hefKS0nt5W9BbjpQEZH957EVA8i8SFrZ0tAOtv/DzrkOH3jTRGeEz+yGG/3z8Eb+RNF6 /lDEQ== X-Received: by 2002:a17:906:f5a2:b0:b97:2a5:8a4d with SMTP id a640c23a62f3a-b9b507a4c29mr187926966b.26.1774627959644; Fri, 27 Mar 2026 09:12:39 -0700 (PDT) Received: from [172.16.220.101] (144-178-202-139.static.ef-service.nl. [144.178.202.139]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b9b20265cc0sm273518366b.15.2026.03.27.09.12.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2026 09:12:39 -0700 (PDT) From: Luca Weiss Date: Fri, 27 Mar 2026 17:12:27 +0100 Subject: [PATCH v2 8/9] drm/msm/dpu: Add Milos support Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260327-milos-mdss-v2-8-bc586683f5ca@fairphone.com> References: <20260327-milos-mdss-v2-0-bc586683f5ca@fairphone.com> In-Reply-To: <20260327-milos-mdss-v2-0-bc586683f5ca@fairphone.com> To: Bjorn Andersson , Konrad Dybcio , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Jonathan Marek , Krishna Manikandan , Neil Armstrong , Alexander Koskovich Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org, Luca Weiss X-Mailer: b4 0.15.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1774627949; l=12018; i=luca.weiss@fairphone.com; s=20250611; h=from:subject:message-id; bh=iKsxeLMALhkJyLMhTvLyLfN9d/jMx3vnocKrUpXfqKI=; b=T/vsj5cUTIyUBz+q1KpOW1hiA1qpYu5VrGB+gfQ9oOjH4Izzt8gb3W3MicCEne/xqWOXeogno EuBa6ed9FuWCLuv8qnV8mbejXBDlWCZlAPd8BS6cqFBh+nia6yAoLIK X-Developer-Key: i=luca.weiss@fairphone.com; a=ed25519; pk=O1aw+AAust5lEmgrNJ1Bs7PTY0fEsJm+mdkjExA69q8= Add definitions for the display hardware used on the Qualcomm Milos platform. Signed-off-by: Luca Weiss --- .../gpu/drm/msm/disp/dpu1/catalog/dpu_10_2_milos.h | 279 +++++++++++++++++= ++++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 29 +++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 1 + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 1 + 4 files changed, 310 insertions(+) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_2_milos.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_10_2_milos.h new file mode 100644 index 000000000000..1aa8aea4e352 --- /dev/null +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_2_milos.h @@ -0,0 +1,279 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (c) 2022. Qualcomm Innovation Center, Inc. All rights reserve= d. + * Copyright (c) 2015-2018, 2020 The Linux Foundation. All rights reserved. + * Copyright (c) 2026, Luca Weiss + */ + +#ifndef _DPU_10_2_MILOS_H +#define _DPU_10_2_MILOS_H + +static const struct dpu_caps milos_dpu_caps =3D { + .max_mixer_width =3D DEFAULT_DPU_OUTPUT_LINE_WIDTH, + .max_mixer_blendstages =3D 0x7, + .has_src_split =3D true, + .has_dim_layer =3D true, + .has_idle_pc =3D true, + .has_3d_merge =3D true, + .max_linewidth =3D 8192, + .pixel_ram_size =3D DEFAULT_PIXEL_RAM_SIZE, +}; + +static const struct dpu_mdp_cfg milos_mdp =3D { + .name =3D "top_0", + .base =3D 0, .len =3D 0x494, + .clk_ctrls =3D { + [DPU_CLK_CTRL_REG_DMA] =3D { .reg_off =3D 0x2bc, .bit_off =3D 20 }, + }, +}; + +static const struct dpu_ctl_cfg milos_ctl[] =3D { + { + .name =3D "ctl_0", .id =3D CTL_0, + .base =3D 0x15000, .len =3D 0x1000, + .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), + }, { + .name =3D "ctl_1", .id =3D CTL_1, + .base =3D 0x16000, .len =3D 0x1000, + .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), + }, { + .name =3D "ctl_2", .id =3D CTL_2, + .base =3D 0x17000, .len =3D 0x1000, + .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 11), + }, { + .name =3D "ctl_3", .id =3D CTL_3, + .base =3D 0x18000, .len =3D 0x1000, + .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 12), + }, +}; + +static const struct dpu_sspp_cfg milos_sspp[] =3D { + { + .name =3D "sspp_0", .id =3D SSPP_VIG0, + .base =3D 0x4000, .len =3D 0x344, + .features =3D VIG_SDM845_MASK_SDMA, + .sblk =3D &dpu_vig_sblk_qseed3_3_3, + .xin_id =3D 0, + .type =3D SSPP_TYPE_VIG, + }, { + .name =3D "sspp_8", .id =3D SSPP_DMA0, + .base =3D 0x24000, .len =3D 0x344, + .features =3D DMA_SDM845_MASK_SDMA, + .sblk =3D &dpu_dma_sblk, + .xin_id =3D 1, + .type =3D SSPP_TYPE_DMA, + }, { + .name =3D "sspp_9", .id =3D SSPP_DMA1, + .base =3D 0x26000, .len =3D 0x344, + .features =3D DMA_SDM845_MASK_SDMA, + .sblk =3D &dpu_dma_sblk, + .xin_id =3D 5, + .type =3D SSPP_TYPE_DMA, + }, { + .name =3D "sspp_10", .id =3D SSPP_DMA2, + .base =3D 0x28000, .len =3D 0x344, + .features =3D DMA_SDM845_MASK_SDMA, + .sblk =3D &dpu_dma_sblk, + .xin_id =3D 9, + .type =3D SSPP_TYPE_DMA, + }, +}; + +static const struct dpu_lm_cfg milos_lm[] =3D { + { + .name =3D "lm_0", .id =3D LM_0, + .base =3D 0x44000, .len =3D 0x400, + .features =3D MIXER_MSM8998_MASK, + .sblk =3D &sdm845_lm_sblk, + .pingpong =3D PINGPONG_0, + .dspp =3D DSPP_0, + }, { + .name =3D "lm_2", .id =3D LM_2, + .base =3D 0x46000, .len =3D 0x400, + .features =3D MIXER_MSM8998_MASK, + .sblk =3D &sdm845_lm_sblk, + .lm_pair =3D LM_3, + .pingpong =3D PINGPONG_2, + }, { + .name =3D "lm_3", .id =3D LM_3, + .base =3D 0x47000, .len =3D 0x400, + .features =3D MIXER_MSM8998_MASK, + .sblk =3D &sdm845_lm_sblk, + .lm_pair =3D LM_2, + .pingpong =3D PINGPONG_3, + }, +}; + +static const struct dpu_dspp_cfg milos_dspp[] =3D { + { + .name =3D "dspp_0", .id =3D DSPP_0, + .base =3D 0x54000, .len =3D 0x1800, + .sblk =3D &sdm845_dspp_sblk, + }, +}; + +static const struct dpu_pingpong_cfg milos_pp[] =3D { + { + .name =3D "pingpong_0", .id =3D PINGPONG_0, + .base =3D 0x69000, .len =3D 0, + .sblk =3D &sc7280_pp_sblk, + .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), + }, { + .name =3D "pingpong_2", .id =3D PINGPONG_2, + .base =3D 0x6b000, .len =3D 0, + .sblk =3D &sc7280_pp_sblk, + .merge_3d =3D MERGE_3D_1, + .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10), + }, { + .name =3D "pingpong_3", .id =3D PINGPONG_3, + .base =3D 0x6c000, .len =3D 0, + .sblk =3D &sc7280_pp_sblk, + .merge_3d =3D MERGE_3D_1, + .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11), + }, { + .name =3D "pingpong_cwb_0", .id =3D PINGPONG_CWB_0, + .base =3D 0x66000, .len =3D 0, + .sblk =3D &sc7280_pp_sblk, + }, +}; + +static const struct dpu_merge_3d_cfg milos_merge_3d[] =3D { + { + .name =3D "merge_3d_1", .id =3D MERGE_3D_1, + .base =3D 0x4f000, .len =3D 0x8, + }, +}; + +/* + * NOTE: Each display compression engine (DCE) contains dual hard + * slice DSC encoders so both share same base address but with + * its own different sub block address. + */ +static const struct dpu_dsc_cfg milos_dsc[] =3D { + { + .name =3D "dce_0_0", .id =3D DSC_0, + .base =3D 0x80000, .len =3D 0x6, + .features =3D BIT(DPU_DSC_NATIVE_42x_EN), + .sblk =3D &milos_dsc_sblk_0, + }, { + .name =3D "dce_0_1", .id =3D DSC_1, + .base =3D 0x80000, .len =3D 0x6, + .features =3D BIT(DPU_DSC_NATIVE_42x_EN), + .sblk =3D &milos_dsc_sblk_1, + }, +}; + +static const struct dpu_wb_cfg milos_wb[] =3D { + { + .name =3D "wb_2", .id =3D WB_2, + .base =3D 0x65000, .len =3D 0x2c8, + .features =3D WB_SDM845_MASK, + .format_list =3D wb2_formats_rgb_yuv, + .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), + .xin_id =3D 6, + .maxlinewidth =3D 4096, + .intr_wb_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 4), + }, +}; + +static const struct dpu_cwb_cfg milos_cwb[] =3D { + { + .name =3D "cwb_0", .id =3D CWB_0, + .base =3D 0x66200, .len =3D 0x8, + }, +}; + +static const struct dpu_intf_cfg milos_intf[] =3D { + { + .name =3D "intf_0", .id =3D INTF_0, + .base =3D 0x34000, .len =3D 0x300, + .type =3D INTF_DP, + .controller_id =3D MSM_DP_CONTROLLER_0, + .prog_fetch_lines_worst_case =3D 24, + .intr_underrun =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 24), + .intr_vsync =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 25), + }, { + .name =3D "intf_1", .id =3D INTF_1, + .base =3D 0x35000, .len =3D 0x300, + .type =3D INTF_DSI, + .controller_id =3D MSM_DSI_CONTROLLER_0, + .prog_fetch_lines_worst_case =3D 24, + .intr_underrun =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 26), + .intr_vsync =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 27), + .intr_tear_rd_ptr =3D DPU_IRQ_IDX(MDP_INTF1_TEAR_INTR, 2), + }, { + .name =3D "intf_3", .id =3D INTF_3, + .base =3D 0x37000, .len =3D 0x300, + .type =3D INTF_DP, + .controller_id =3D MSM_DP_CONTROLLER_0, /* pair with intf_0 for DP MST */ + .prog_fetch_lines_worst_case =3D 24, + .intr_underrun =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 30), + .intr_vsync =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 31), + }, +}; + +static const struct dpu_perf_cfg milos_perf_data =3D { + .max_bw_low =3D 7100000, + .max_bw_high =3D 9800000, + .min_core_ib =3D 2500000, + .min_llcc_ib =3D 0, + .min_dram_ib =3D 1600000, + .min_prefill_lines =3D 40, + /* FIXME: lut tables */ + .danger_lut_tbl =3D {0x3ffff, 0x3ffff, 0x0}, + .safe_lut_tbl =3D {0xff00, 0xfff0, 0x0fff}, + .qos_lut_tbl =3D { + {.nentry =3D ARRAY_SIZE(sc7180_qos_linear), + .entries =3D sc7180_qos_linear + }, + {.nentry =3D ARRAY_SIZE(sc7180_qos_macrotile), + .entries =3D sc7180_qos_macrotile + }, + {.nentry =3D ARRAY_SIZE(sc7180_qos_nrt), + .entries =3D sc7180_qos_nrt + }, + /* TODO: macrotile-qseed is different from macrotile */ + }, + .cdp_cfg =3D { + {.rd_enable =3D 1, .wr_enable =3D 1}, + {.rd_enable =3D 1, .wr_enable =3D 0} + }, + .clk_inefficiency_factor =3D 105, + .bw_inefficiency_factor =3D 120, +}; + +static const struct dpu_mdss_version milos_mdss_ver =3D { + .core_major_ver =3D 10, + .core_minor_ver =3D 2, +}; + +const struct dpu_mdss_cfg dpu_milos_cfg =3D { + .mdss_ver =3D &milos_mdss_ver, + .caps =3D &milos_dpu_caps, + .mdp =3D &milos_mdp, + .cdm =3D &dpu_cdm_5_x, + .ctl_count =3D ARRAY_SIZE(milos_ctl), + .ctl =3D milos_ctl, + .sspp_count =3D ARRAY_SIZE(milos_sspp), + .sspp =3D milos_sspp, + .mixer_count =3D ARRAY_SIZE(milos_lm), + .mixer =3D milos_lm, + .dspp_count =3D ARRAY_SIZE(milos_dspp), + .dspp =3D milos_dspp, + .pingpong_count =3D ARRAY_SIZE(milos_pp), + .pingpong =3D milos_pp, + .dsc_count =3D ARRAY_SIZE(milos_dsc), + .dsc =3D milos_dsc, + .merge_3d_count =3D ARRAY_SIZE(milos_merge_3d), + .merge_3d =3D milos_merge_3d, + .wb_count =3D ARRAY_SIZE(milos_wb), + .wb =3D milos_wb, + .cwb_count =3D ARRAY_SIZE(milos_cwb), + .cwb =3D milos_cwb, + .intf_count =3D ARRAY_SIZE(milos_intf), + .intf =3D milos_intf, + .vbif =3D &milos_vbif, + .perf =3D &milos_perf_data, +}; + +#endif diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c b/drivers/gpu/d= rm/msm/disp/dpu1/dpu_hw_catalog.c index bb4fd5fa4b22..2e10add84fd7 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -454,6 +454,16 @@ static const struct dpu_dsc_sub_blks dsc_sblk_1 =3D { .ctl =3D {.name =3D "ctl", .base =3D 0xF80, .len =3D 0x10}, }; =20 +static const struct dpu_dsc_sub_blks milos_dsc_sblk_0 =3D { + .enc =3D {.name =3D "enc", .base =3D 0x100, .len =3D 0x100}, + .ctl =3D {.name =3D "ctl", .base =3D 0xF00, .len =3D 0x80}, +}; + +static const struct dpu_dsc_sub_blks milos_dsc_sblk_1 =3D { + .enc =3D {.name =3D "enc", .base =3D 0x200, .len =3D 0x100}, + .ctl =3D {.name =3D "ctl", .base =3D 0xF80, .len =3D 0x80}, +}; + static const struct dpu_dsc_sub_blks sm8750_dsc_sblk_0 =3D { .enc =3D {.name =3D "enc", .base =3D 0x100, .len =3D 0x100}, .ctl =3D {.name =3D "ctl", .base =3D 0xF00, .len =3D 0x24}, @@ -513,6 +523,23 @@ static const struct dpu_vbif_dynamic_ot_cfg msm8998_ot= _rdwr_cfg[] =3D { }, }; =20 +static const struct dpu_vbif_cfg milos_vbif =3D { + .len =3D 0x1074, + .features =3D BIT(DPU_VBIF_QOS_REMAP), + .xin_halt_timeout =3D 0x4000, + .qos_rp_remap_size =3D 0x40, + .qos_rt_tbl =3D { + .npriority_lvl =3D ARRAY_SIZE(sdm845_rt_pri_lvl), + .priority_lvl =3D sdm845_rt_pri_lvl, + }, + .qos_nrt_tbl =3D { + .npriority_lvl =3D ARRAY_SIZE(sdm845_nrt_pri_lvl), + .priority_lvl =3D sdm845_nrt_pri_lvl, + }, + .memtype_count =3D 16, + .memtype =3D {3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3}, +}; + static const struct dpu_vbif_cfg msm8996_vbif =3D { .len =3D 0x1040, .default_ot_rd_limit =3D 32, @@ -754,6 +781,8 @@ static const struct dpu_qos_lut_entry sc7180_qos_nrt[] = =3D { #include "catalog/dpu_9_2_x1e80100.h" =20 #include "catalog/dpu_10_0_sm8650.h" +#include "catalog/dpu_10_2_milos.h" + #include "catalog/dpu_12_0_sm8750.h" #include "catalog/dpu_12_2_glymur.h" #include "catalog/dpu_12_4_eliza.h" diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h b/drivers/gpu/d= rm/msm/disp/dpu1/dpu_hw_catalog.h index ba04ac24d5a9..f45faf87333e 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -766,6 +766,7 @@ struct dpu_mdss_cfg { extern const struct dpu_mdss_cfg dpu_eliza_cfg; extern const struct dpu_mdss_cfg dpu_glymur_cfg; extern const struct dpu_mdss_cfg dpu_kaanapali_cfg; +extern const struct dpu_mdss_cfg dpu_milos_cfg; extern const struct dpu_mdss_cfg dpu_msm8917_cfg; extern const struct dpu_mdss_cfg dpu_msm8937_cfg; extern const struct dpu_mdss_cfg dpu_msm8953_cfg; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/= disp/dpu1/dpu_kms.c index 35f7af4743d7..7c37bd51f934 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -1483,6 +1483,7 @@ static const struct of_device_id dpu_dt_match[] =3D { { .compatible =3D "qcom,eliza-dpu", .data =3D &dpu_eliza_cfg, }, { .compatible =3D "qcom,glymur-dpu", .data =3D &dpu_glymur_cfg, }, { .compatible =3D "qcom,kaanapali-dpu", .data =3D &dpu_kaanapali_cfg, }, + { .compatible =3D "qcom,milos-dpu", .data =3D &dpu_milos_cfg, }, { .compatible =3D "qcom,msm8917-mdp5", .data =3D &dpu_msm8917_cfg, }, { .compatible =3D "qcom,msm8937-mdp5", .data =3D &dpu_msm8937_cfg, }, { .compatible =3D "qcom,msm8953-mdp5", .data =3D &dpu_msm8953_cfg, }, --=20 2.53.0