msm:disp:dpu1: add support for display for SC7180 target
Subsystems (5)
PATCH v3 1/1 msm:disp:dpu1: add support for display for SC7180 target
Add display hw catalog changes for SC7180 target.
Changes in v1:
- Configure register offsets and capabilities for the display hw blocks.
Changes in v2:
- mdss_irq data type has changed in the dependent patch, accommodate the necessary changes.
- Add co-developed-by tags in the commit msg (Stephen Boyd).
Changes in v3:
- fix kernel checkpatch errors in v2
This patch has dependency on the below series
https://patchwork.kernel.org/patch/11253647/
--- .../devicetree/bindings/display/msm/dpu.txt | 4 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 189 +++++++++++++++++++-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 4 + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 3 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 1 + drivers/gpu/drm/msm/msm_drv.c | 4 +- 6 files changed, 190 insertions(+), 15 deletions(-)
Documentation/devicetree/bindings/display/msm/dpu.txt +2 -2
@@ -8,7 +8,7 @@ The DPU display controller is found in SDM845 SoC. MDSS: Required properties: -- compatible: "qcom,sdm845-mdss" +- compatible: "qcom,sdm845-mdss", "qcom,sc7180-mdss" - reg: physical base address and length of contoller's registers. - reg-names: register region names. The following region is required: * "mdss"
@@ -41,7 +41,7 @@ Optional properties: MDP: Required properties: -- compatible: "qcom,sdm845-dpu" +- compatible: "qcom,sdm845-dpu", "qcom,sc7180-dpu" - reg: physical base address and length of controller's registers. - reg-names : register region names. The following region is required: * "mdp"
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +178 -11
288 lines not on this page · raw message
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +4 -0
@@ -38,6 +38,7 @@#define DPU_HW_VER_401 DPU_HW_VER(4, 0, 1)/* sdm845 v2.0 */ #define DPU_HW_VER_410 DPU_HW_VER(4, 1, 0)/* sdm670 v1.0 */ #define DPU_HW_VER_500 DPU_HW_VER(5, 0, 0)/* sdm855 v1.0 */ +#define DPU_HW_VER_620 DPU_HW_VER(6, 2, 0)/* sc7180 v1.0 */ #define IS_MSM8996_TARGET (rev) IS_DPU_MAJOR_MINOR_SAME((rev), DPU_HW_VER_170)
@@ -45,6 +46,7 @@#define IS_SDM845_TARGET (rev) IS_DPU_MAJOR_MINOR_SAME((rev), DPU_HW_VER_400)#define IS_SDM670_TARGET (rev) IS_DPU_MAJOR_MINOR_SAME((rev), DPU_HW_VER_410)#define IS_SDM855_TARGET (rev) IS_DPU_MAJOR_MINOR_SAME((rev), DPU_HW_VER_500) +#define IS_SC7180_TARGET (rev) IS_DPU_MAJOR_MINOR_SAME((rev), DPU_HW_VER_620)#define DPU_HW_BLK_NAME_LEN 16
@@ -110,6 +112,7 @@ enum {DPU_SSPP_SRC =0x1 ,DPU_SSPP_SCALER_QSEED2 ,DPU_SSPP_SCALER_QSEED3 , +DPU_SSPP_SCALER_QSEED4 ,DPU_SSPP_SCALER_RGB ,DPU_SSPP_CSC , DPU_SSPP_CSC_10BIT,
@@ -166,6 +169,7 @@ enum {*/ enum {DPU_CTL_SPLIT_DISPLAY =0x1 , +DPU_CTL_ACTIVE_CFG ,DPU_CTL_MAX };
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c +2 -1
@@ -152,7 +152,8 @@ static void _setup_mixer_ops(struct dpu_mdss_cfg *m, unsigned long features) { ops->setup_mixer_out = dpu_hw_lm_setup_out; -if (IS_SDM845_TARGET (m->hwversion) ||IS_SDM670_TARGET (m->hwversion)) +if (IS_SDM845_TARGET (m->hwversion) ||IS_SDM670_TARGET (m->hwversion) + ||IS_SC7180_TARGET (m->hwversion)) ops->setup_blend_config = dpu_hw_lm_setup_blend_config_sdm845;else ops->setup_blend_config = dpu_hw_lm_setup_blend_config;
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +1 -0
@@ -1111,6 +1111,7 @@ static int __maybe_unused dpu_runtime_resume(struct device *dev)static const struct of_device_id dpu_dt_match[] = { { .compatible ="qcom,sdm845-dpu" , }, + { .compatible ="qcom,sc7180-dpu" , }, {} };MODULE_DEVICE_TABLE (of, dpu_dt_match);
drivers/gpu/drm/msm/msm_drv.c +3 -1
@@ -1192,7 +1192,8 @@ static int add_display_components(struct device *dev,* the interfaces to our components list. */ if (of_device_is_compatible (dev->of_node,"qcom,mdss" ) || -of_device_is_compatible (dev->of_node,"qcom,sdm845-mdss" )) { +of_device_is_compatible (dev->of_node,"qcom,sdm845-mdss" ) || +of_device_is_compatible (dev->of_node,"qcom,sc7180-mdss" )) { ret =of_platform_populate (dev->of_node,NULL ,NULL , dev);if (ret) {DRM_DEV_ERROR (dev,"failed to populate children devices\n" );
@@ -1317,6 +1318,7 @@ static int msm_pdev_remove(struct platform_device *pdev) { .compatible = "qcom,mdp4", .data = (void *)KMS_MDP4 }, { .compatible = "qcom,mdss", .data = (void *)KMS_MDP5 }, { .compatible = "qcom,sdm845-mdss", .data = (void *)KMS_DPU }, + { .compatible = "qcom,sc7180-mdss", .data = (void *)KMS_DPU }, {} };MODULE_DEVICE_TABLE (of, dt_match);
Signature · 6 lines
1.9.1 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
Quoted 6 lines · Kalyan Thota
Add display hw catalog changes for SC7180 target.
Changes in v1:
- Configure register offsets and capabilities for the display hw blocks.
Quoted 7 lines
Changes in v2:
-mdss_irqdata type has changed in the dependent patch, accommodate the necessary changes.
- Add co-developed-by tags in the commit msg (Stephen Boyd).Changes in v3:
- fix kernel checkpatch errors in v2
But not the one telling you to split bindings to separate patch?
Quoted 5 lines
This patch has dependency on the below series
Quoted 7 lines
Co-developed-by Shubhashree Dhar <[email protected]>Signed-off-by Shubhashree Dhar <[email protected]>Co-developed-by Raviteja Tamatam <[email protected]>Signed-off-by Raviteja Tamatam <[email protected]>Signed-off-by Kalyan Thota <[email protected]>--- .../devicetree/bindings/display/msm/dpu.txt | 4 +-
Quoted 21 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 189 +++++++++++++++++++-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 4 + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 3 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 1 + drivers/gpu/drm/msm/msm_drv.c | 4 +- 6 files changed, 190 insertions(+), 15 deletions(-)Documentation/devicetree/bindings/display/msm/dpu.txt +1
-1@@ -8,7 +8,7 @@ The DPU display controller is found in SDM845 SoC. MDSS: Required properties: -- compatible: "qcom,sdm845-mdss" +- compatible: "qcom,sdm845-mdss", "qcom,sc7180-mdss" - reg: physical base address and length of contoller's registers. - reg-names: register region names. The following region is required: * "mdss"
Documentation/devicetree/bindings/display/msm/dpu.txt Optional properties: · line 47
Quoted 8 lines
Documentation/devicetree/bindings/display/msm/dpu.txt +1
-1@@ -41,7 +41,7 @@ Optional properties: MDP: Required properties: -- compatible: "qcom,sdm845-dpu" +- compatible: "qcom,sdm845-dpu", "qcom,sc7180-dpu" - reg: physical base address and length of controller's registers. - reg-names : register region names. The following region is required: * "mdp"
_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno