Add SM6115 MDSS/DPU support
Subsystems (5)
v2 cover Add SM6115 MDSS/DPU support
This patch series add support for MDSS and DPU block found on SM6115. These patches were tested on Xiaomi Redmi 9T smartphone.
Changes since v1
================
1. Adjusted YAMLs per requests.
2. Changed MDP regs to lowercase hex.
3. Rebased series over latest next and SM8450 patches.
Adam Skladowski (2):
dt-bindings: display/msm: add support for SM6115 drm/msm/disp/dpu1: add support for display on SM6115
.../bindings/display/msm/qcom,sm6115-dpu.yaml | 94 +++++++++ .../display/msm/qcom,sm6115-mdss.yaml | 182 ++++++++++++++++++ .../gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 87 +++++++++ .../gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 1 + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 1 + drivers/gpu/drm/msm/msm_mdss.c | 5 + 6 files changed, 370 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm6115-dpu.yaml create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm6115-mdss.yaml
Signature · 1 line
2.25.1
PATCH v2 1/2 dt-bindings: display/msm: add support for SM6115
Add DPU and MDSS schemas to describe MDSS and DPU blocks on the Qualcomm SM6115 platform.
Configuration for DSI/PHY is shared with QCM2290 so compatibles are reused. Lack of dsi phy supply in example is intended
due to fact on qcm2290, sm6115 and sm6125
this phy is supplied via power domain, not regulator.
--- .../bindings/display/msm/qcom,sm6115-dpu.yaml | 94 +++++++++ .../display/msm/qcom,sm6115-mdss.yaml | 182 ++++++++++++++++++ 2 files changed, 276 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm6115-dpu.yaml create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm6115-mdss.yaml
Documentation/devicetree/bindings/display/msm/qcom,sm6115-dpu.yaml new file +94 -0
@@ -0,0 +1,94 @@ +# SPDX-License-Identifier: GPL-2.0-only or BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/msm/qcom,sm6115-dpu.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm Display DPU dt properties for SM6115 target + +maintainers: + - Dmitry Baryshkov <[email protected]> + +$ref: /schemas/display/msm/dpu-common.yaml# + +properties: + compatible: + items: + - const: qcom,sm6115-dpu + + reg: + items: + - description: MDP register set + - description: VBIF register set + + reg-names: + items: + - const: mdp + - const: vbif + + clocks: + items: + - description: Display AXI + - description: Display AHB + - description: Display core + - description: Display lut + - description: Display rotator + - description: Display vsync + + clock-names: + items: + - const: bus + - const: iface + - const: core + - const: lut + - const: rot + - const: vsync + +required: + - compatible + - reg + - reg-names + - clocks + - clock-names + +unevaluatedProperties: false + +examples: + - | + #include <dt-bindings/clock/qcom,sm6115-dispcc.h> + #include <dt-bindings/clock/qcom,gcc-sm6115.h> + #include <dt-bindings/power/qcom-rpmpd.h> + + display-controller@5e01000 { + compatible = "qcom,sm6115-dpu"; + reg = <0x05e01000 0x8f000>, + <0x05eb0000 0x2008>; + reg-names = "mdp", "vbif"; + + clocks = <&gcc GCC_DISP_HF_AXI_CLK>, + <&dispcc DISP_CC_MDSS_AHB_CLK>, + <&dispcc DISP_CC_MDSS_MDP_CLK>, + <&dispcc DISP_CC_MDSS_MDP_LUT_CLK>, + <&dispcc DISP_CC_MDSS_ROT_CLK>, + <&dispcc DISP_CC_MDSS_VSYNC_CLK>; + clock-names = "bus", "iface", "core", "lut", "rot", "vsync"; + + operating-points-v2 = <&mdp_opp_table>; + power-domains = <&rpmpd SM6115_VDDCX>; + + interrupt-parent = <&mdss>; + interrupts = <0>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + endpoint { + remote-endpoint = <&dsi0_in>; + }; + }; + }; + }; +...
Documentation/devicetree/bindings/display/msm/qcom,sm6115-mdss.yaml new file +182 -0
182 lines not on this page · raw message
Signature · 1 line
2.25.1
Re: [PATCH v2 1/2] dt-bindings: display/msm: add support for SM6115
Quoted 9 lines · Adam Skladowski
Add DPU and MDSS schemas to describe MDSS and DPU blocks on the Qualcomm SM6115 platform.
Configuration for DSI/PHY is shared with QCM2290 so compatibles are reused. Lack of dsi phy supply in example is intended
due to fact on qcm2290, sm6115 and sm6125
this phy is supplied via power domain, not regulator.Signed-off-by Adam Skladowski <[email protected]>---
Best regards,
Krzysztof
Re: [PATCH v2 1/2] dt-bindings: display/msm: add support for SM6115
In reply to Adam SkladowskiQuoted 279 lines · Adam Skladowski
Add DPU and MDSS schemas to describe MDSS and DPU blocks on the Qualcomm SM6115 platform.
Configuration for DSI/PHY is shared with QCM2290 so compatibles are reused. Lack of dsi phy supply in example is intended
due to fact on qcm2290, sm6115 and sm6125
this phy is supplied via power domain, not regulator.Signed-off-by Adam Skladowski <[email protected]>--- .../bindings/display/msm/qcom,sm6115-dpu.yaml | 94 +++++++++ .../display/msm/qcom,sm6115-mdss.yaml | 182 ++++++++++++++++++ 2 files changed, 276 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm6115-dpu.yaml create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm6115-mdss.yamlDocumentation/devicetree/bindings/display/msm/qcom,sm6115-dpu.yaml new file +94
-0@@ -0,0 +1,94 @@ +# SPDX-License-Identifier: GPL-2.0-only or BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/msm/qcom,sm6115-dpu.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm Display DPU dt properties for SM6115 target + +maintainers: + - Dmitry Baryshkov <[email protected]> + +$ref: /schemas/display/msm/dpu-common.yaml# + +properties: + compatible: + items: + - const: qcom,sm6115-dpu + + reg: + items: + - description: MDP register set + - description: VBIF register set + + reg-names: + items: + - const: mdp + - const: vbif + + clocks: + items: + - description: Display AXI + - description: Display AHB + - description: Display core + - description: Display lut + - description: Display rotator + - description: Display vsync + + clock-names: + items: + - const: bus + - const: iface + - const: core + - const: lut + - const: rot + - const: vsync + +required: + - compatible + - reg + - reg-names + - clocks + - clock-names + +unevaluatedProperties: false + +examples: + - | + #include <dt-bindings/clock/qcom,sm6115-dispcc.h> + #include <dt-bindings/clock/qcom,gcc-sm6115.h> + #include <dt-bindings/power/qcom-rpmpd.h> + + display-controller@5e01000 { + compatible = "qcom,sm6115-dpu"; + reg = <0x05e01000 0x8f000>, + <0x05eb0000 0x2008>; + reg-names = "mdp", "vbif"; + + clocks = <&gcc GCC_DISP_HF_AXI_CLK>, + <&dispcc DISP_CC_MDSS_AHB_CLK>, + <&dispcc DISP_CC_MDSS_MDP_CLK>, + <&dispcc DISP_CC_MDSS_MDP_LUT_CLK>, + <&dispcc DISP_CC_MDSS_ROT_CLK>, + <&dispcc DISP_CC_MDSS_VSYNC_CLK>; + clock-names = "bus", "iface", "core", "lut", "rot", "vsync"; + + operating-points-v2 = <&mdp_opp_table>; + power-domains = <&rpmpd SM6115_VDDCX>; + + interrupt-parent = <&mdss>; + interrupts = <0>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + endpoint { + remote-endpoint = <&dsi0_in>; + }; + }; + }; + }; +...Documentation/devicetree/bindings/display/msm/qcom,sm6115-mdss.yaml new file +157
-0@@ -0,0 +1,182 @@ +# SPDX-License-Identifier: GPL-2.0-only or BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/msm/qcom,sm6115-mdss.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm SM6115 Display MDSS + +maintainers: + - Dmitry Baryshkov <[email protected]> + +description: + Device tree bindings for MSM Mobile Display Subsystem(MDSS) that encapsulates + sub-blocks like DPU display controller and DSI. Device tree bindings of MDSS + are mentioned for SM6115 target. + +$ref: /schemas/display/msm/mdss-common.yaml# + +properties: + compatible: + items: + - const: qcom,sm6115-mdss + + clocks: + items: + - description: Display AHB clock from gcc + - description: Display AXI clock + - description: Display core clock + + iommus: + maxItems: 2 + +patternProperties: + "^display-controller@[0-9a-f]+$": + type: object + properties: + compatible: + const: qcom,sm6115-dpu + + "^dsi@[0-9a-f]+$": + type: object + properties: + compatible: + const: qcom,dsi-ctrl-6g-qcm2290 + + "^phy@[0-9a-f]+$": + type: object + properties: + compatible: + const: qcom,dsi-phy-14nm-2290 + +required: + - compatible + +unevaluatedProperties: false + +examples: + - | + #include <dt-bindings/clock/qcom,sm6115-dispcc.h> + #include <dt-bindings/clock/qcom,gcc-sm6115.h> + #include <dt-bindings/clock/qcom,rpmcc.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/power/qcom-rpmpd.h> + + mdss@5e00000 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "qcom,sm6115-mdss"; + reg = <0x05e00000 0x1000>; + reg-names = "mdss"; + power-domains = <&dispcc MDSS_GDSC>; + clocks = <&gcc GCC_DISP_AHB_CLK>, + <&gcc GCC_DISP_HF_AXI_CLK>, + <&dispcc DISP_CC_MDSS_MDP_CLK>; + + interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>; + interrupt-controller; + #interrupt-cells = <1>; + + iommus = <&apps_smmu 0x420 0x2>, + <&apps_smmu 0x421 0x0>; + ranges; + + display-controller@5e01000 { + compatible = "qcom,sm6115-dpu"; + reg = <0x05e01000 0x8f000>, + <0x05eb0000 0x2008>; + reg-names = "mdp", "vbif"; + + clocks = <&gcc GCC_DISP_HF_AXI_CLK>, + <&dispcc DISP_CC_MDSS_AHB_CLK>, + <&dispcc DISP_CC_MDSS_MDP_CLK>, + <&dispcc DISP_CC_MDSS_MDP_LUT_CLK>, + <&dispcc DISP_CC_MDSS_ROT_CLK>, + <&dispcc DISP_CC_MDSS_VSYNC_CLK>; + clock-names = "bus", "iface", "core", "lut", "rot", "vsync"; + + operating-points-v2 = <&mdp_opp_table>; + power-domains = <&rpmpd SM6115_VDDCX>; + + interrupt-parent = <&mdss>; + interrupts = <0>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + dpu_intf1_out: endpoint { + remote-endpoint = <&dsi0_in>; + }; + }; + }; + }; + + dsi@5e94000 { + compatible = "qcom,dsi-ctrl-6g-qcm2290"; + reg = <0x05e94000 0x400>; + reg-names = "dsi_ctrl"; + + interrupt-parent = <&mdss>; + interrupts = <4>; + + clocks = <&dispcc DISP_CC_MDSS_BYTE0_CLK>, + <&dispcc DISP_CC_MDSS_BYTE0_INTF_CLK>, + <&dispcc DISP_CC_MDSS_PCLK0_CLK>, + <&dispcc DISP_CC_MDSS_ESC0_CLK>, + <&dispcc DISP_CC_MDSS_AHB_CLK>, + <&gcc GCC_DISP_HF_AXI_CLK>; + clock-names = "byte", + "byte_intf", + "pixel", + "core", + "iface", + "bus"; + assigned-clocks = <&dispcc DISP_CC_MDSS_BYTE0_CLK_SRC>, <&dispcc DISP_CC_MDSS_PCLK0_CLK_SRC>; + assigned-clock-parents = <&dsi0_phy 0>, <&dsi0_phy 1>; + + operating-points-v2 = <&dsi_opp_table>; + power-domains = <&rpmpd SM6115_VDDCX>; + phys = <&dsi0_phy>; + + #address-cells = <1>; + #size-cells = <0>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + dsi0_in: endpoint { + remote-endpoint = <&dpu_intf1_out>; + }; + }; +
Documentation/devicetree/bindings/display/msm/qcom,sm6115-mdss.yaml line 167
Quoted 10 lines
Documentation/devicetree/bindings/display/msm/qcom,sm6115-mdss.yaml new file +10
-0+ port@1 { + reg = <1>; + dsi0_out: endpoint { + }; + }; + }; + }; + + dsi0_phy: phy@5e94400 { + compatible = "qcom,dsi-phy-14nm-2290";
Now that this is in linux-next, there's a warning:
/builds/robherring/linux-dt/Documentation/devicetree/bindings/display/msm/qcom,sm6115-mdss.example.dtb:
phy@5e94400: 'vcca-supply' is a required property
From schema:
/builds/robherring/linux-dt/Documentation/devicetree/bindings/display/msm/dsi-phy-14nm.yaml
Perhaps some change in dsi-phy-14nm.yaml.
Rob
PATCH v2 2/2 drm/msm/disp/dpu1: add support for display on SM6115
In reply to Adam SkladowskiAdd required display hw catalog changes for SM6115.
--- .../gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 87 +++++++++++++++++++ .../gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 1 + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 1 + drivers/gpu/drm/msm/msm_mdss.c | 5 ++ 4 files changed, 94 insertions(+)
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +87 -0
@@ -330,6 +330,18 @@ static const struct dpu_caps sc7180_dpu_caps = { .pixel_ram_size = DEFAULT_PIXEL_RAM_SIZE, }; +static const struct dpu_caps sm6115_dpu_caps = { + .max_mixer_width =DEFAULT_DPU_OUTPUT_LINE_WIDTH , + .max_mixer_blendstages =0x4 , + .qseed_type =DPU_SSPP_SCALER_QSEED3LITE , + .smart_dma_rev =DPU_SSPP_SMART_DMA_V2 ,/* TODO: v2.5 */ + .ubwc_version =DPU_HW_UBWC_VER_20 , + .has_dim_layer = true, + .has_idle_pc = true, + .max_linewidth =2160 , + .pixel_ram_size =DEFAULT_PIXEL_RAM_SIZE , +}; +static const struct dpu_caps sm8150_dpu_caps = { .max_mixer_width =DEFAULT_DPU_OUTPUT_LINE_WIDTH , .max_mixer_blendstages =0xb ,
@@ -498,6 +510,19 @@ static const struct dpu_mdp_cfg sc8180x_mdp[] = { }, }; +static const struct dpu_mdp_cfg sm6115_mdp[] = { + { + .name ="top_0" , .id =MDP_TOP , + .base =0x0 , .len =0x494 , + .features =0 , + .highest_bank_bit =0x1 , + .clk_ctrls[DPU_CLK_CTRL_VIG0 ] = { + .reg_off =0x2ac , .bit_off =0 }, + .clk_ctrls[DPU_CLK_CTRL_DMA0 ] = { + .reg_off =0x2ac , .bit_off =8 }, + }, +}; +static const struct dpu_mdp_cfg sm8250_mdp[] = { { .name ="top_0" , .id =MDP_TOP ,
@@ -941,6 +966,16 @@ static const struct dpu_sspp_cfg sc7180_sspp[] = { sdm845_dma_sblk_2, 9, SSPP_TYPE_DMA, DPU_CLK_CTRL_CURSOR1), }; +static const struct dpu_sspp_sub_blks sm6115_vig_sblk_0 = +_VIG_SBLK ("0" ,2 ,DPU_SSPP_SCALER_QSEED3LITE ); + +static const struct dpu_sspp_cfg sm6115_sspp[] = { +SSPP_BLK ("sspp_0" ,SSPP_VIG0 ,0x4000 ,VIG_SM8250_MASK , + sm6115_vig_sblk_0,0 ,SSPP_TYPE_VIG ,DPU_CLK_CTRL_VIG0 ), +SSPP_BLK ("sspp_8" ,SSPP_DMA0 ,0x24000 ,DMA_SDM845_MASK , + sdm845_dma_sblk_0,1 ,SSPP_TYPE_DMA ,DPU_CLK_CTRL_DMA0 ), +}; +static const struct dpu_sspp_sub_blks sm8250_vig_sblk_0 =_VIG_SBLK ("0" ,5 ,DPU_SSPP_SCALER_QSEED3LITE ); static const struct dpu_sspp_sub_blks sm8250_vig_sblk_1 =
@@ -1757,6 +1792,35 @@ static const struct dpu_perf_cfg sc7180_perf_data = { .bw_inefficiency_factor = 120, }; +static const struct dpu_perf_cfg sm6115_perf_data = { + .max_bw_low =3100000 , + .max_bw_high =4000000 , + .min_core_ib =2400000 , + .min_llcc_ib =800000 , + .min_dram_ib =800000 , + .min_prefill_lines =24 , + .danger_lut_tbl = {0xff ,0xffff ,0x0 }, + .safe_lut_tbl = {0xfff0 ,0xff00 ,0xffff }, + .qos_lut_tbl = { + {.nentry =ARRAY_SIZE (sc7180_qos_linear), + .entries = sc7180_qos_linear + }, + {.nentry =ARRAY_SIZE (sc7180_qos_macrotile), + .entries = sc7180_qos_macrotile + }, + {.nentry =ARRAY_SIZE (sc7180_qos_nrt), + .entries = sc7180_qos_nrt + }, +/* TODO: macrotile-qseed is different from macrotile */ + }, + .cdp_cfg = { + {.rd_enable =1 , .wr_enable =1 }, + {.rd_enable =1 , .wr_enable =0 } + }, + .clk_inefficiency_factor =105 , + .bw_inefficiency_factor =120 , +}; +static const struct dpu_perf_cfg sm8150_perf_data = { .max_bw_low =12800000 , .max_bw_high =12800000 ,
@@ -1998,6 +2062,28 @@ static const struct dpu_mdss_cfg sc7180_dpu_cfg = { .mdss_irqs = IRQ_SC7180_MASK, }; +static const struct dpu_mdss_cfg sm6115_dpu_cfg = { + .caps = &sm6115_dpu_caps, + .mdp_count =ARRAY_SIZE (sm6115_mdp), + .mdp = sm6115_mdp, + .ctl_count =ARRAY_SIZE (qcm2290_ctl), + .ctl = qcm2290_ctl, + .sspp_count =ARRAY_SIZE (sm6115_sspp), + .sspp = sm6115_sspp, + .mixer_count =ARRAY_SIZE (qcm2290_lm), + .mixer = qcm2290_lm, + .dspp_count =ARRAY_SIZE (qcm2290_dspp), + .dspp = qcm2290_dspp, + .pingpong_count =ARRAY_SIZE (qcm2290_pp), + .pingpong = qcm2290_pp, + .intf_count =ARRAY_SIZE (qcm2290_intf), + .intf = qcm2290_intf, + .vbif_count =ARRAY_SIZE (sdm845_vbif), + .vbif = sdm845_vbif, + .perf = &sm6115_perf_data, + .mdss_irqs =IRQ_SC7180_MASK , +}; +static const struct dpu_mdss_cfg sm8150_dpu_cfg = { .caps = &sm8150_dpu_caps, .mdp_count =ARRAY_SIZE (sdm845_mdp),
@@ -2158,6 +2244,7 @@ static const struct dpu_mdss_hw_cfg_handler cfg_handler[] = { { .hw_rev = DPU_HW_VER_510, .dpu_cfg = &sc8180x_dpu_cfg}, { .hw_rev = DPU_HW_VER_600, .dpu_cfg = &sm8250_dpu_cfg}, { .hw_rev = DPU_HW_VER_620, .dpu_cfg = &sc7180_dpu_cfg}, + { .hw_rev = DPU_HW_VER_630, .dpu_cfg = &sm6115_dpu_cfg}, { .hw_rev = DPU_HW_VER_650, .dpu_cfg = &qcm2290_dpu_cfg}, { .hw_rev = DPU_HW_VER_720, .dpu_cfg = &sc7280_dpu_cfg}, { .hw_rev = DPU_HW_VER_810, .dpu_cfg = &sm8450_dpu_cfg},
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +1 -0
@@ -44,6 +44,7 @@#define DPU_HW_VER_510 DPU_HW_VER(5, 1, 1)/* sc8180 */ #define DPU_HW_VER_600 DPU_HW_VER(6, 0, 0)/* sm8250 */ #define DPU_HW_VER_620 DPU_HW_VER(6, 2, 0)/* sc7180 v1.0 */ +#define DPU_HW_VER_630 DPU_HW_VER(6, 3, 0)/* sm6115|sm4250 */ #define DPU_HW_VER_650 DPU_HW_VER(6, 5, 0)/* qcm2290|sm4125 */ #define DPU_HW_VER_720 DPU_HW_VER(7, 2, 0)/* sc7280 */ #define DPU_HW_VER_810 DPU_HW_VER(8, 1, 0)/* sm8450 */
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +1 -0
@@ -1299,6 +1299,7 @@ static const struct of_device_id dpu_dt_match[] = { { .compatible = "qcom,sc7180-dpu", }, { .compatible = "qcom,sc7280-dpu", }, { .compatible = "qcom,sc8180x-dpu", }, + { .compatible = "qcom,sm6115-dpu", }, { .compatible = "qcom,sm8150-dpu", }, { .compatible = "qcom,sm8250-dpu", }, { .compatible = "qcom,sm8450-dpu", },
drivers/gpu/drm/msm/msm_mdss.c +5 -0
@@ -280,6 +280,10 @@ static int msm_mdss_enable(struct msm_mdss *msm_mdss)/* UBWC_2_0 */ msm_mdss_setup_ubwc_dec_20 (msm_mdss,0x1e );break ; +case DPU_HW_VER_630 : +/* UBWC_2_0 */ +msm_mdss_setup_ubwc_dec_20 (msm_mdss,0x11f ); +break ;case DPU_HW_VER_720 :msm_mdss_setup_ubwc_dec_40 (msm_mdss,UBWC_3_0 ,6 ,1 ,1 ,1 );break ;
@@ -513,6 +517,7 @@ static const struct of_device_id mdss_dt_match[] = { { .compatible = "qcom,sc7180-mdss" }, { .compatible = "qcom,sc7280-mdss" }, { .compatible = "qcom,sc8180x-mdss" }, + { .compatible = "qcom,sm6115-mdss" }, { .compatible = "qcom,sm8150-mdss" }, { .compatible = "qcom,sm8250-mdss" }, { .compatible = "qcom,sm8450-mdss" },
Signature · 1 line
2.25.1
Re: [PATCH v2 2/2] drm/msm/disp/dpu1: add support for display on SM6115
Quoted 5 lines · Adam Skladowski
Add required display hw catalog changes for SM6115.
Reviewed-by Dmitry Baryshkov <[email protected]>Signed-off-by Adam Skladowski <[email protected]>---
Konrad
Quoted 186 lines
.../gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 87 +++++++++++++++++++ .../gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 1 + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 1 + drivers/gpu/drm/msm/msm_mdss.c | 5 ++ 4 files changed, 94 insertions(+)drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +87
-0@@ -330,6 +330,18 @@ static const struct dpu_caps sc7180_dpu_caps = { .pixel_ram_size = DEFAULT_PIXEL_RAM_SIZE, }; +static const struct dpu_caps sm6115_dpu_caps = { + .max_mixer_width =DEFAULT_DPU_OUTPUT_LINE_WIDTH , + .max_mixer_blendstages =0x4 , + .qseed_type =DPU_SSPP_SCALER_QSEED3LITE , + .smart_dma_rev =DPU_SSPP_SMART_DMA_V2 ,/* TODO: v2.5 */ + .ubwc_version =DPU_HW_UBWC_VER_20 , + .has_dim_layer = true, + .has_idle_pc = true, + .max_linewidth =2160 , + .pixel_ram_size =DEFAULT_PIXEL_RAM_SIZE , +}; +static const struct dpu_caps sm8150_dpu_caps = { .max_mixer_width =DEFAULT_DPU_OUTPUT_LINE_WIDTH , .max_mixer_blendstages =0xb ,@@ -498,6 +510,19 @@ static const struct dpu_mdp_cfg sc8180x_mdp[] = { }, }; +static const struct dpu_mdp_cfg sm6115_mdp[] = { + { + .name ="top_0" , .id =MDP_TOP , + .base =0x0 , .len =0x494 , + .features =0 , + .highest_bank_bit =0x1 , + .clk_ctrls[DPU_CLK_CTRL_VIG0 ] = { + .reg_off =0x2ac , .bit_off =0 }, + .clk_ctrls[DPU_CLK_CTRL_DMA0 ] = { + .reg_off =0x2ac , .bit_off =8 }, + }, +}; +static const struct dpu_mdp_cfg sm8250_mdp[] = { { .name ="top_0" , .id =MDP_TOP ,@@ -941,6 +966,16 @@ static const struct dpu_sspp_cfg sc7180_sspp[] = { sdm845_dma_sblk_2, 9, SSPP_TYPE_DMA, DPU_CLK_CTRL_CURSOR1), }; +static const struct dpu_sspp_sub_blks sm6115_vig_sblk_0 = +_VIG_SBLK ("0" ,2 ,DPU_SSPP_SCALER_QSEED3LITE ); + +static const struct dpu_sspp_cfg sm6115_sspp[] = { +SSPP_BLK ("sspp_0" ,SSPP_VIG0 ,0x4000 ,VIG_SM8250_MASK , + sm6115_vig_sblk_0,0 ,SSPP_TYPE_VIG ,DPU_CLK_CTRL_VIG0 ), +SSPP_BLK ("sspp_8" ,SSPP_DMA0 ,0x24000 ,DMA_SDM845_MASK , + sdm845_dma_sblk_0,1 ,SSPP_TYPE_DMA ,DPU_CLK_CTRL_DMA0 ), +}; +static const struct dpu_sspp_sub_blks sm8250_vig_sblk_0 =_VIG_SBLK ("0" ,5 ,DPU_SSPP_SCALER_QSEED3LITE ); static const struct dpu_sspp_sub_blks sm8250_vig_sblk_1 =@@ -1757,6 +1792,35 @@ static const struct dpu_perf_cfg sc7180_perf_data = { .bw_inefficiency_factor = 120, }; +static const struct dpu_perf_cfg sm6115_perf_data = { + .max_bw_low =3100000 , + .max_bw_high =4000000 , + .min_core_ib =2400000 , + .min_llcc_ib =800000 , + .min_dram_ib =800000 , + .min_prefill_lines =24 , + .danger_lut_tbl = {0xff ,0xffff ,0x0 }, + .safe_lut_tbl = {0xfff0 ,0xff00 ,0xffff }, + .qos_lut_tbl = { + {.nentry =ARRAY_SIZE (sc7180_qos_linear), + .entries = sc7180_qos_linear + }, + {.nentry =ARRAY_SIZE (sc7180_qos_macrotile), + .entries = sc7180_qos_macrotile + }, + {.nentry =ARRAY_SIZE (sc7180_qos_nrt), + .entries = sc7180_qos_nrt + }, +/* TODO: macrotile-qseed is different from macrotile */ + }, + .cdp_cfg = { + {.rd_enable =1 , .wr_enable =1 }, + {.rd_enable =1 , .wr_enable =0 } + }, + .clk_inefficiency_factor =105 , + .bw_inefficiency_factor =120 , +}; +static const struct dpu_perf_cfg sm8150_perf_data = { .max_bw_low =12800000 , .max_bw_high =12800000 ,@@ -1998,6 +2062,28 @@ static const struct dpu_mdss_cfg sc7180_dpu_cfg = { .mdss_irqs = IRQ_SC7180_MASK, }; +static const struct dpu_mdss_cfg sm6115_dpu_cfg = { + .caps = &sm6115_dpu_caps, + .mdp_count =ARRAY_SIZE (sm6115_mdp), + .mdp = sm6115_mdp, + .ctl_count =ARRAY_SIZE (qcm2290_ctl), + .ctl = qcm2290_ctl, + .sspp_count =ARRAY_SIZE (sm6115_sspp), + .sspp = sm6115_sspp, + .mixer_count =ARRAY_SIZE (qcm2290_lm), + .mixer = qcm2290_lm, + .dspp_count =ARRAY_SIZE (qcm2290_dspp), + .dspp = qcm2290_dspp, + .pingpong_count =ARRAY_SIZE (qcm2290_pp), + .pingpong = qcm2290_pp, + .intf_count =ARRAY_SIZE (qcm2290_intf), + .intf = qcm2290_intf, + .vbif_count =ARRAY_SIZE (sdm845_vbif), + .vbif = sdm845_vbif, + .perf = &sm6115_perf_data, + .mdss_irqs =IRQ_SC7180_MASK , +}; +static const struct dpu_mdss_cfg sm8150_dpu_cfg = { .caps = &sm8150_dpu_caps, .mdp_count =ARRAY_SIZE (sdm845_mdp),@@ -2158,6 +2244,7 @@ static const struct dpu_mdss_hw_cfg_handler cfg_handler[] = { { .hw_rev = DPU_HW_VER_510, .dpu_cfg = &sc8180x_dpu_cfg}, { .hw_rev = DPU_HW_VER_600, .dpu_cfg = &sm8250_dpu_cfg}, { .hw_rev = DPU_HW_VER_620, .dpu_cfg = &sc7180_dpu_cfg}, + { .hw_rev = DPU_HW_VER_630, .dpu_cfg = &sm6115_dpu_cfg}, { .hw_rev = DPU_HW_VER_650, .dpu_cfg = &qcm2290_dpu_cfg}, { .hw_rev = DPU_HW_VER_720, .dpu_cfg = &sc7280_dpu_cfg}, { .hw_rev = DPU_HW_VER_810, .dpu_cfg = &sm8450_dpu_cfg},drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +1
-0@@ -44,6 +44,7 @@#define DPU_HW_VER_510 DPU_HW_VER(5, 1, 1)/* sc8180 */ #define DPU_HW_VER_600 DPU_HW_VER(6, 0, 0)/* sm8250 */ #define DPU_HW_VER_620 DPU_HW_VER(6, 2, 0)/* sc7180 v1.0 */ +#define DPU_HW_VER_630 DPU_HW_VER(6, 3, 0)/* sm6115|sm4250 */ #define DPU_HW_VER_650 DPU_HW_VER(6, 5, 0)/* qcm2290|sm4125 */ #define DPU_HW_VER_720 DPU_HW_VER(7, 2, 0)/* sc7280 */ #define DPU_HW_VER_810 DPU_HW_VER(8, 1, 0)/* sm8450 */ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +1
-0@@ -1299,6 +1299,7 @@ static const struct of_device_id dpu_dt_match[] = { { .compatible = "qcom,sc7180-dpu", }, { .compatible = "qcom,sc7280-dpu", }, { .compatible = "qcom,sc8180x-dpu", }, + { .compatible = "qcom,sm6115-dpu", }, { .compatible = "qcom,sm8150-dpu", }, { .compatible = "qcom,sm8250-dpu", }, { .compatible = "qcom,sm8450-dpu", },drivers/gpu/drm/msm/msm_mdss.c +5
-0@@ -280,6 +280,10 @@ static int msm_mdss_enable(struct msm_mdss *msm_mdss)/* UBWC_2_0 */ msm_mdss_setup_ubwc_dec_20 (msm_mdss,0x1e );break ; +case DPU_HW_VER_630 : +/* UBWC_2_0 */ +msm_mdss_setup_ubwc_dec_20 (msm_mdss,0x11f ); +break ;case DPU_HW_VER_720 :msm_mdss_setup_ubwc_dec_40 (msm_mdss,UBWC_3_0 ,6 ,1 ,1 ,1 );break ;@@ -513,6 +517,7 @@ static const struct of_device_id mdss_dt_match[] = { { .compatible = "qcom,sc7180-mdss" }, { .compatible = "qcom,sc7280-mdss" }, { .compatible = "qcom,sc8180x-mdss" }, + { .compatible = "qcom,sm6115-mdss" }, { .compatible = "qcom,sm8150-mdss" }, { .compatible = "qcom,sm8250-mdss" }, { .compatible = "qcom,sm8450-mdss" },