DRM/MSM: Add support for MSM8956 and Adreno 510
Subsystems (6)
v2 cover DRM/MSM: Add support for MSM8956 and Adreno 510
From: AngeloGioacchino Del Regno <[email protected]>
This patch series enables support for MSM8956/76 and its Adreno 510 GPU on the current DRM driver.
The personal aim is to upstream MSM8956 as much as possible.
This code has been tested on two Sony phones featuring the Qualcomm MSM8956 SoC.
Changes in v2:
- MDP5: Documented tbu and tbu_rt clocks (Jeffrey)
- Adreno510:
- Lower case hex where required (Jordan)
- Direct register writes (Jordan)
- Used gpu_rmw() where required (Jordan)
- No mentioning of unsupported A5xx (Jordan)
- ZAP firmware exclusions not per-model (Rob)
Angelo G. Del Regno (5):
drm/msm/mdp5: Add optional TBU and TBU_RT clocks drm/msm/mdp5: Add configuration for msm8x56 drm/msm/dsi: Add configuration for 28nm PLL on family B drm/msm/dsi: Add configuration for 8x56 drm/msm/adreno: Add support for Adreno 510 GPU
.../devicetree/bindings/display/msm/dsi.txt | 1 + .../devicetree/bindings/display/msm/mdp5.txt | 2 + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 73 +++++++++++--- drivers/gpu/drm/msm/adreno/a5xx_power.c | 7 ++ drivers/gpu/drm/msm/adreno/adreno_device.c | 15 +++ drivers/gpu/drm/msm/adreno/adreno_gpu.h | 5 + drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 99 +++++++++++++++++++ drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 10 ++ drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.h | 2 + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 22 +++++ drivers/gpu/drm/msm/dsi/dsi_cfg.h | 1 + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 2 + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 1 + drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 18 ++++ 14 files changed, 244 insertions(+), 14 deletions(-)
Signature · 6 lines
2.21.0 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
A message that is not in the archive (sent off-list or not yet received): 20190926105256.61412-1-kholk11-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
PATCH v2 1/5 drm/msm/mdp5: Add optional TBU and TBU_RT clocks
From: "Angelo G. Del Regno" <[email protected]>
Some SoCs, like MSM8956/8976 (and APQ variants), do feature these clocks and we need to enable them in order to get the hardware to properly work.
--- Documentation/devicetree/bindings/display/msm/mdp5.txt | 2 ++ drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 10 ++++++++++ drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.h | 2 ++ 3 files changed, 14 insertions(+)
Documentation/devicetree/bindings/display/msm/mdp5.txt +2 -0
@@ -76,6 +76,8 @@ Required properties: Optional properties: - clock-names: the following clocks are optional: * "lut" + * "tbu" + * "tbu_rt" Example:
drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +10 -0
@@ -293,6 +293,10 @@ int mdp5_disable(struct mdp5_kms *mdp5_kms) mdp5_kms->enable_count--;WARN_ON (mdp5_kms->enable_count <0 ); +if (mdp5_kms->tbu_rt_clk) +clk_disable_unprepare (mdp5_kms->tbu_rt_clk); +if (mdp5_kms->tbu_clk) +clk_disable_unprepare (mdp5_kms->tbu_clk);clk_disable_unprepare (mdp5_kms->ahb_clk);clk_disable_unprepare (mdp5_kms->axi_clk);clk_disable_unprepare (mdp5_kms->core_clk);
@@ -313,6 +317,10 @@ int mdp5_enable(struct mdp5_kms *mdp5_kms)clk_prepare_enable (mdp5_kms->core_clk);if (mdp5_kms->lut_clk)clk_prepare_enable (mdp5_kms->lut_clk); +if (mdp5_kms->tbu_clk) +clk_prepare_enable (mdp5_kms->tbu_clk); +if (mdp5_kms->tbu_rt_clk) +clk_prepare_enable (mdp5_kms->tbu_rt_clk);return 0 ; }
@@ -948,6 +956,8 @@ static int mdp5_init(struct platform_device *pdev, struct drm_device *dev)/* optional clocks: */ get_clk (pdev, &mdp5_kms->lut_clk,"lut" , false); +get_clk (pdev, &mdp5_kms->tbu_clk,"tbu" , false); +get_clk (pdev, &mdp5_kms->tbu_rt_clk,"tbu_rt" , false);/* we need to set a default rate before enabling. Set a safe * rate first, then figure out hw revision, and then set a
drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.h +2 -0
@@ -53,6 +53,8 @@ struct mdp5_kms {struct clk *ahb_clk;struct clk *core_clk;struct clk *lut_clk; +struct clk *tbu_clk; +struct clk *tbu_rt_clk;struct clk *vsync_clk;/*
Signature · 6 lines
2.21.0 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
Sean Paul
reviewerRe: [PATCH v2 1/5] drm/msm/mdp5: Add optional TBU and TBU_RT clocks
Quoted 1 line · On Thu, Sep 26, 2019 at 12:52:52PM +0200, [email protected] wrote:
From: "Angelo G. Del Regno" <[email protected]>
Hi Angelo,
Thank you for your patches!
Quoted 4 lines
Some SoCs, like MSM8956/8976 (and APQ variants), do feature these clocks and we need to enable them in order to get the hardware to properly work.
Could you add an explanation to the commit message of what these clocks are/do, for those of us who don't know?
Quoted 13 lines
Signed-off-by Angelo G. Del Regno <[email protected]>--- Documentation/devicetree/bindings/display/msm/mdp5.txt | 2 ++ drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 10 ++++++++++ drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.h | 2 ++ 3 files changed, 14 insertions(+)Documentation/devicetree/bindings/display/msm/mdp5.txt +0
-0
Documentation/devicetree/bindings/display/msm/mdp5.txt Required properties: · line 80
Quoted 5 lines
Documentation/devicetree/bindings/display/msm/mdp5.txt +2
-0@@ -76,6 +76,8 @@ Required properties: Optional properties: - clock-names: the following clocks are optional: * "lut" + * "tbu" + * "tbu_rt"
Bindings updates should be in their own patch, and you'll need to cc the correct dt lists and maintainers (especially Rob Herring) in order to get their attention. (hint: use scripts/get_maintainer.pl)
Sean
Quoted 54 lines
Documentation/devicetree/bindings/display/msm/mdp5.txt +0
-0Example:drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +10
-0@@ -293,6 +293,10 @@ int mdp5_disable(struct mdp5_kms *mdp5_kms) mdp5_kms->enable_count--;WARN_ON (mdp5_kms->enable_count <0 ); +if (mdp5_kms->tbu_rt_clk) +clk_disable_unprepare (mdp5_kms->tbu_rt_clk); +if (mdp5_kms->tbu_clk) +clk_disable_unprepare (mdp5_kms->tbu_clk);clk_disable_unprepare (mdp5_kms->ahb_clk);clk_disable_unprepare (mdp5_kms->axi_clk);clk_disable_unprepare (mdp5_kms->core_clk);@@ -313,6 +317,10 @@ int mdp5_enable(struct mdp5_kms *mdp5_kms)clk_prepare_enable (mdp5_kms->core_clk);if (mdp5_kms->lut_clk)clk_prepare_enable (mdp5_kms->lut_clk); +if (mdp5_kms->tbu_clk) +clk_prepare_enable (mdp5_kms->tbu_clk); +if (mdp5_kms->tbu_rt_clk) +clk_prepare_enable (mdp5_kms->tbu_rt_clk);return 0 ; }@@ -948,6 +956,8 @@ static int mdp5_init(struct platform_device *pdev, struct drm_device *dev)/* optional clocks: */ get_clk (pdev, &mdp5_kms->lut_clk,"lut" , false); +get_clk (pdev, &mdp5_kms->tbu_clk,"tbu" , false); +get_clk (pdev, &mdp5_kms->tbu_rt_clk,"tbu_rt" , false);/* we need to set a default rate before enabling. Set a safe * rate first, then figure out hw revision, and then set a drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.h +2
-0@@ -53,6 +53,8 @@ struct mdp5_kms {struct clk *ahb_clk;struct clk *core_clk;struct clk *lut_clk; +struct clk *tbu_clk; +struct clk *tbu_rt_clk;struct clk *vsync_clk;/* Signature · 1 line
2.21.0
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 2/5 drm/msm/mdp5: Add configuration for msm8x56
In reply to a message not in the archiveFrom: "Angelo G. Del Regno" <[email protected]>
Add the configuration entries for the MDP5 v1.11, found on MSM8956 and APQ8056.
--- drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 99 ++++++++++++++++++++++++ 1 file changed, 99 insertions(+)
drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c +99 -0
@@ -545,6 +545,104 @@ const struct mdp5_cfg_hw msm8x96_config = { .max_clk = 412500000, }; +const struct mdp5_cfg_hw msm8x56_config = { + .name ="msm8x56" , + .mdp = { + .count =1 , + .caps =MDP_CAP_SMP | +MDP_CAP_DSC | +MDP_CAP_SRC_SPLIT | +0 , + }, + .ctl = { + .count =3 , + .base = {0x01000 ,0x01200 ,0x01400 }, + .flush_hw_mask =0xffffffff , + }, + .smp = { + .mmb_count =10 , + .mmb_size =10240 , + .clients = { + [SSPP_VIG0 ] =1 , [SSPP_VIG1 ] =9 , + [SSPP_DMA0 ] =4 , + [SSPP_RGB0 ] =7 , [SSPP_RGB1 ] =8 , + }, + }, + .pipe_vig = { + .count =2 , + .base = {0x04000 ,0x06000 }, + .caps =MDP_PIPE_CAP_HFLIP | +MDP_PIPE_CAP_VFLIP | +MDP_PIPE_CAP_SCALE | +MDP_PIPE_CAP_CSC | +MDP_PIPE_CAP_DECIMATION | +MDP_PIPE_CAP_SW_PIX_EXT | +0 , + }, + .pipe_rgb = { + .count =2 , + .base = {0x14000 ,0x16000 }, + .caps =MDP_PIPE_CAP_HFLIP | +MDP_PIPE_CAP_VFLIP | +MDP_PIPE_CAP_DECIMATION | +MDP_PIPE_CAP_SW_PIX_EXT | +0 , + }, + .pipe_dma = { + .count =1 , + .base = {0x24000 }, + .caps =MDP_PIPE_CAP_HFLIP | +MDP_PIPE_CAP_VFLIP | +MDP_PIPE_CAP_SW_PIX_EXT | +0 , + }, + .pipe_cursor = { + .count =1 , + .base = {0x440DC }, + .caps =MDP_PIPE_CAP_HFLIP | +MDP_PIPE_CAP_VFLIP | +MDP_PIPE_CAP_SW_PIX_EXT | +MDP_PIPE_CAP_CURSOR | +0 , + }, + + .lm = { + .count =2 , + .base = {0x44000 ,0x45000 }, + .instances = { + { .id =0 , .pp =0 , .dspp =0 , + .caps =MDP_LM_CAP_DISPLAY , }, + { .id =1 , .pp =-1 , .dspp =-1 , + .caps =MDP_LM_CAP_WB }, + }, + .nb_stages =8 , + .max_width =2560 , + .max_height =0xFFFF , + }, + .dspp = { + .count =1 , + .base = {0x54000 }, + + }, + .pp = { + .count =3 , + .base = {0x70000 ,0x70800 ,0x72000 }, + }, + .dsc = { + .count =2 , + .base = {0x80000 ,0x80400 }, + }, + .intf = { + .base = {0x6a000 ,0x6a800 ,0x6b000 }, + .connect = { + [0 ] =INTF_DISABLED , + [1 ] =INTF_DSI , + [2 ] =INTF_DSI , + }, + }, + .max_clk =360000000 , +}; +const struct mdp5_cfg_hw msm8917_config = { .name ="msm8917" , .mdp = {
@@ -637,6 +735,7 @@ static const struct mdp5_cfg_handler cfg_handlers[] = { { .revision = 6, .config = { .hw = &msm8x16_config } }, { .revision = 9, .config = { .hw = &msm8x94_config } }, { .revision = 7, .config = { .hw = &msm8x96_config } }, + { .revision = 11, .config = { .hw = &msm8x56_config } }, { .revision = 15, .config = { .hw = &msm8917_config } }, };
Signature · 6 lines
2.21.0 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH v2 3/5 drm/msm/dsi: Add configuration for 28nm PLL on family B
In reply to a message not in the archiveFrom: "Angelo G. Del Regno" <[email protected]>
The 28nm PLL has a different iospace on MSM/APQ family B SoCs:
add a new configuration and use it when the DT reports the "qcom,dsi-phy-28nm-hpm-fam-b" compatible.
--- .../devicetree/bindings/display/msm/dsi.txt | 1 + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 2 ++ drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 1 + drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 18 ++++++++++++++++++ 4 files changed, 22 insertions(+)
Documentation/devicetree/bindings/display/msm/dsi.txt +1 -0
@@ -83,6 +83,7 @@ DSI PHY: Required properties: - compatible: Could be the following * "qcom,dsi-phy-28nm-hpm" + * "qcom,dsi-phy-28nm-hpm-fam-b" * "qcom,dsi-phy-28nm-lp" * "qcom,dsi-phy-20nm" * "qcom,dsi-phy-28nm-8960"
drivers/gpu/drm/msm/dsi/phy/dsi_phy.c +2 -0
@@ -481,6 +481,8 @@ static const struct of_device_id dsi_phy_dt_match[] = { #ifdef CONFIG_DRM_MSM_DSI_28NM_PHY { .compatible = "qcom,dsi-phy-28nm-hpm", .data = &dsi_phy_28nm_hpm_cfgs }, + { .compatible = "qcom,dsi-phy-28nm-hpm-fam-b", + .data = &dsi_phy_28nm_hpm_famb_cfgs }, { .compatible = "qcom,dsi-phy-28nm-lp", .data = &dsi_phy_28nm_lp_cfgs }, #endif
drivers/gpu/drm/msm/dsi/phy/dsi_phy.h +1 -0
@@ -40,6 +40,7 @@ struct msm_dsi_phy_cfg { };extern const struct msm_dsi_phy_cfg dsi_phy_28nm_hpm_cfgs; +extern const struct msm_dsi_phy_cfg dsi_phy_28nm_hpm_famb_cfgs;extern const struct msm_dsi_phy_cfg dsi_phy_28nm_lp_cfgs;extern const struct msm_dsi_phy_cfg dsi_phy_20nm_cfgs;extern const struct msm_dsi_phy_cfg dsi_phy_28nm_8960_cfgs;
drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c +18 -0
@@ -142,6 +142,24 @@ const struct msm_dsi_phy_cfg dsi_phy_28nm_hpm_cfgs = { .num_dsi_phy = 2, }; +const struct msm_dsi_phy_cfg dsi_phy_28nm_hpm_famb_cfgs = { + .type =MSM_DSI_PHY_28NM_HPM , + .src_pll_truthtable = { {true, true}, {false, true} }, + .reg_cfg = { + .num =1 , + .regs = { + {"vddio" ,100000 ,100 }, + }, + }, + .ops = { + .enable = dsi_28nm_phy_enable, + .disable = dsi_28nm_phy_disable, + .init = msm_dsi_phy_init_common, + }, + .io_start = {0x1a94400 ,0x1a94800 }, + .num_dsi_phy =2 , +}; +const struct msm_dsi_phy_cfg dsi_phy_28nm_lp_cfgs = { .type =MSM_DSI_PHY_28NM_LP , .src_pll_truthtable = { {true, true}, {true, true} },
Signature · 6 lines
2.21.0 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
Sean Paul
reviewerRe: [PATCH v2 3/5] drm/msm/dsi: Add configuration for 28nm PLL on family B
Quoted 19 lines · On Thu, Sep 26, 2019 at 12:52:54PM +0200, [email protected] wrote:
From: "Angelo G. Del Regno" <[email protected]>
The 28nm PLL has a different iospace on MSM/APQ family B SoCs:
add a new configuration and use it when the DT reports the "qcom,dsi-phy-28nm-hpm-fam-b" compatible.Signed-off-by Angelo G. Del Regno <[email protected]>--- .../devicetree/bindings/display/msm/dsi.txt | 1 + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 2 ++ drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 1 + drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 18 ++++++++++++++++++ 4 files changed, 22 insertions(+)Documentation/devicetree/bindings/display/msm/dsi.txt +0
-0
Documentation/devicetree/bindings/display/msm/dsi.txt DSI PHY: · line 89
Quoted 7 lines
Documentation/devicetree/bindings/display/msm/dsi.txt +1
-0@@ -83,6 +83,7 @@ DSI PHY: Required properties: - compatible: Could be the following * "qcom,dsi-phy-28nm-hpm" + * "qcom,dsi-phy-28nm-hpm-fam-b" * "qcom,dsi-phy-28nm-lp" * "qcom,dsi-phy-20nm" * "qcom,dsi-phy-28nm-8960"
Same comment here re: putting binding updates in separate patches.
Sean
Quoted 57 lines
drivers/gpu/drm/msm/dsi/phy/dsi_phy.c +2
-0@@ -481,6 +481,8 @@ static const struct of_device_id dsi_phy_dt_match[] = { #ifdef CONFIG_DRM_MSM_DSI_28NM_PHY { .compatible = "qcom,dsi-phy-28nm-hpm", .data = &dsi_phy_28nm_hpm_cfgs }, + { .compatible = "qcom,dsi-phy-28nm-hpm-fam-b", + .data = &dsi_phy_28nm_hpm_famb_cfgs }, { .compatible = "qcom,dsi-phy-28nm-lp", .data = &dsi_phy_28nm_lp_cfgs }, #endifdrivers/gpu/drm/msm/dsi/phy/dsi_phy.h +1
-0@@ -40,6 +40,7 @@ struct msm_dsi_phy_cfg { };extern const struct msm_dsi_phy_cfg dsi_phy_28nm_hpm_cfgs; +extern const struct msm_dsi_phy_cfg dsi_phy_28nm_hpm_famb_cfgs;extern const struct msm_dsi_phy_cfg dsi_phy_28nm_lp_cfgs;extern const struct msm_dsi_phy_cfg dsi_phy_20nm_cfgs;extern const struct msm_dsi_phy_cfg dsi_phy_28nm_8960_cfgs;drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c +18
-0@@ -142,6 +142,24 @@ const struct msm_dsi_phy_cfg dsi_phy_28nm_hpm_cfgs = { .num_dsi_phy = 2, }; +const struct msm_dsi_phy_cfg dsi_phy_28nm_hpm_famb_cfgs = { + .type =MSM_DSI_PHY_28NM_HPM , + .src_pll_truthtable = { {true, true}, {false, true} }, + .reg_cfg = { + .num =1 , + .regs = { + {"vddio" ,100000 ,100 }, + }, + }, + .ops = { + .enable = dsi_28nm_phy_enable, + .disable = dsi_28nm_phy_disable, + .init = msm_dsi_phy_init_common, + }, + .io_start = {0x1a94400 ,0x1a94800 }, + .num_dsi_phy =2 , +}; +const struct msm_dsi_phy_cfg dsi_phy_28nm_lp_cfgs = { .type =MSM_DSI_PHY_28NM_LP , .src_pll_truthtable = { {true, true}, {true, true} },Signature · 1 line
2.21.0
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 4/5 drm/msm/dsi: Add configuration for 8x56
In reply to a message not in the archiveFrom: "Angelo G. Del Regno" <[email protected]>
MSM8956/APQ8056 has DSI version 3:10040002 (DSI 6G V1.4.2), featuring two DSIs. It needs three clocks (mdp_core, iface, bus), one GDSC and two vregs, VDDA at 1.2V and VDDIO at 1.8V.
--- drivers/gpu/drm/msm/dsi/dsi_cfg.c | 22 ++++++++++++++++++++++ drivers/gpu/drm/msm/dsi/dsi_cfg.h | 1 + 2 files changed, 23 insertions(+)
drivers/gpu/drm/msm/dsi/dsi_cfg.c +22 -0
@@ -66,6 +66,26 @@ static const struct msm_dsi_config msm8916_dsi_cfg = { .num_dsi = 1, }; +static const char *const dsi_8956_bus_clk_names[] = { +"mdp_core" ,"iface" ,"bus" , +}; + +static const struct msm_dsi_config msm8956_dsi_cfg = { + .io_offset =DSI_6G_REG_SHIFT , + .reg_cfg = { + .num =3 , + .regs = { + {"gdsc" ,-1 ,-1 }, + {"vdda" ,100000 ,100 },/* 1.2 V */ + {"vddio" ,100000 ,100 },/* 1.8 V */ + }, + }, + .bus_clk_names = dsi_8956_bus_clk_names, + .num_bus_clks =ARRAY_SIZE (dsi_8956_bus_clk_names), + .io_start = {0x1a94000 ,0x1a96000 }, + .num_dsi =2 , +}; +static const struct msm_dsi_config msm8994_dsi_cfg = { .io_offset =DSI_6G_REG_SHIFT , .reg_cfg = {
@@ -197,6 +217,8 @@ static const struct msm_dsi_cfg_handler dsi_cfg_handlers[] = { &msm8916_dsi_cfg, &msm_dsi_6g_host_ops}, {MSM_DSI_VER_MAJOR_6G ,MSM_DSI_6G_VER_MINOR_V1_4_1 , &msm8996_dsi_cfg, &msm_dsi_6g_host_ops}, + {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V1_4_2, + &msm8956_dsi_cfg, &msm_dsi_6g_host_ops}, {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_2_0, &msm8998_dsi_cfg, &msm_dsi_6g_v2_host_ops}, {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_2_1,
drivers/gpu/drm/msm/dsi/dsi_cfg.h +1 -0
@@ -17,6 +17,7 @@#define MSM_DSI_6G_VER_MINOR_V1_3 0x10030000#define MSM_DSI_6G_VER_MINOR_V1_3_1 0x10030001#define MSM_DSI_6G_VER_MINOR_V1_4_1 0x10040001 +#define MSM_DSI_6G_VER_MINOR_V1_4_2 0x10040002#define MSM_DSI_6G_VER_MINOR_V2_2_0 0x20000000#define MSM_DSI_6G_VER_MINOR_V2_2_1 0x20020001
Signature · 6 lines
2.21.0 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH v2 5/5 drm/msm/adreno: Add support for Adreno 510 GPU
In reply to a message not in the archiveFrom: "Angelo G. Del Regno" <[email protected]>
The Adreno 510 GPU is a stripped version of the Adreno 5xx, found in low-end SoCs like 8x56 and 8x76, which has 256K of GMEM, with no GPMU nor ZAP.
Also, since the Adreno 5xx part of this driver seems to be developed with high-end Adreno GPUs in mind, and since this is a lower end one, add a comment making clear which GPUs which support is not implemented yet is not using the GPMU related hw init code, so that future developers will not go crazy with that.
By the way, the lower end Adreno GPUs with no GPMU are:
A505/A506/A510 (usually no ZAP firmware) A508/A509/A512 (usually with ZAP firmware)
--- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 73 +++++++++++++++++----- drivers/gpu/drm/msm/adreno/a5xx_power.c | 7 +++ drivers/gpu/drm/msm/adreno/adreno_device.c | 15 +++++ drivers/gpu/drm/msm/adreno/adreno_gpu.h | 5 ++ 4 files changed, 86 insertions(+), 14 deletions(-)
drivers/gpu/drm/msm/adreno/a5xx_gpu.c +59 -14
@@ -353,6 +353,9 @@ static int a5xx_me_init(struct msm_gpu *gpu)* 2D mode 3 draw */ OUT_RING (ring,0x0000000B ); + }else if (adreno_is_a510 (adreno_gpu)) { +/* Workaround for token and syncs */ +OUT_RING (ring,0x00000001 ); }else {/* No workarounds enabled */ OUT_RING (ring,0x00000000 );
@@ -568,15 +571,24 @@ static int a5xx_hw_init(struct msm_gpu *gpu) 0x00100000 + adreno_gpu->gmem - 1);gpu_write (gpu,REG_A5XX_UCHE_GMEM_RANGE_MAX_HI ,0x00000000 ); -gpu_write (gpu,REG_A5XX_CP_MEQ_THRESHOLDS ,0x40 ); -if (adreno_is_a530 (adreno_gpu)) -gpu_write (gpu,REG_A5XX_CP_MERCIU_SIZE ,0x40 ); -if (adreno_is_a540 (adreno_gpu)) -gpu_write (gpu,REG_A5XX_CP_MERCIU_SIZE ,0x400 ); -gpu_write (gpu,REG_A5XX_CP_ROQ_THRESHOLDS_2 ,0x80000060 ); -gpu_write (gpu,REG_A5XX_CP_ROQ_THRESHOLDS_1 ,0x40201B16 ); - -gpu_write (gpu,REG_A5XX_PC_DBG_ECO_CNTL , (0x400 <<11 |0x300 <<22 )); +if (adreno_is_a510 (adreno_gpu)) { +gpu_write (gpu,REG_A5XX_CP_MEQ_THRESHOLDS ,0x20 ); +gpu_write (gpu,REG_A5XX_CP_MERCIU_SIZE ,0x20 ); +gpu_write (gpu,REG_A5XX_CP_ROQ_THRESHOLDS_2 ,0x40000030 ); +gpu_write (gpu,REG_A5XX_CP_ROQ_THRESHOLDS_1 ,0x20100D0A ); +gpu_write (gpu,REG_A5XX_PC_DBG_ECO_CNTL , + (0x200 <<11 |0x200 <<22 )); + }else { +gpu_write (gpu,REG_A5XX_CP_MEQ_THRESHOLDS ,0x40 ); +if (adreno_is_a530 (adreno_gpu)) +gpu_write (gpu,REG_A5XX_CP_MERCIU_SIZE ,0x40 ); +if (adreno_is_a540 (adreno_gpu)) +gpu_write (gpu,REG_A5XX_CP_MERCIU_SIZE ,0x400 ); +gpu_write (gpu,REG_A5XX_CP_ROQ_THRESHOLDS_2 ,0x80000060 ); +gpu_write (gpu,REG_A5XX_CP_ROQ_THRESHOLDS_1 ,0x40201B16 ); +gpu_write (gpu,REG_A5XX_PC_DBG_ECO_CNTL , + (0x400 <<11 |0x300 <<22 )); + }if (adreno_gpu->info->quirks &ADRENO_QUIRK_TWO_PASS_USE_WFI )gpu_rmw (gpu,REG_A5XX_PC_DBG_ECO_CNTL ,0 , (1 <<8 ));
@@ -589,6 +601,19 @@ static int a5xx_hw_init(struct msm_gpu *gpu)/* Enable ME/PFP split notification */ gpu_write (gpu,REG_A5XX_RBBM_AHB_CNTL1 ,0xA6FFFFFF ); +/* +* In A5x, CCU can send context_done event of a particular context to +* UCHE which ultimately reaches CP even when there is valid +* transaction of that context inside CCU. This can let CP to program +* config registers, which will make the "valid transaction" inside +* CCU to be interpreted differently. This can cause gpu fault. This +* bug is fixed in latest A510 revision. To enable this bug fix - +* bit[11] of RB_DBG_ECO_CNTL need to be set to 0, default is 1 +* (disable). For older A510 version this bit is unused. +*/ +if (adreno_is_a510 (adreno_gpu)) +gpu_rmw (gpu,REG_A5XX_RB_DBG_ECO_CNTL , (1 <<11 ),0 ); +/* Enable HWCG */ a5xx_set_hwcg (gpu, true);
@@ -635,7 +660,7 @@ static int a5xx_hw_init(struct msm_gpu *gpu)/* UCHE */ gpu_write (gpu,REG_A5XX_CP_PROTECT (16 ),ADRENO_PROTECT_RW (0xE80 ,16 )); -if (adreno_is_a530 (adreno_gpu)) +if (adreno_is_a530 (adreno_gpu) ||adreno_is_a510 (adreno_gpu))gpu_write (gpu,REG_A5XX_CP_PROTECT (17 ),ADRENO_PROTECT_RW (0x10000 ,0x8000 ));
@@ -679,7 +704,8 @@ static int a5xx_hw_init(struct msm_gpu *gpu)a5xx_preempt_hw_init (gpu); -a5xx_gpmu_ucode_init (gpu); +if (!adreno_is_a510 (adreno_gpu)) +a5xx_gpmu_ucode_init (gpu); ret =a5xx_ucode_init (gpu);if (ret)
@@ -712,7 +738,8 @@ static int a5xx_hw_init(struct msm_gpu *gpu) }/* -* Try to load a zap shader into the secure world. If successful +* If the chip that we are using does support loading one, then +* try to load a zap shader into the secure world. If successful * we can use the CP to switch out of secure mode. If not then we * have no resource but to try to switch ourselves out manually. If we * guessed wrong then access to the RBBM_SECVID_TRUST_CNTL register will
@@ -1066,6 +1093,7 @@ static void a5xx_dump(struct msm_gpu *gpu)static int a5xx_pm_resume (struct msm_gpu *gpu) { +struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu);int ret;/* Turn on the core power */
@@ -1073,6 +1101,15 @@ static int a5xx_pm_resume(struct msm_gpu *gpu)if (ret)return ret; +if (adreno_is_a510 (adreno_gpu)) { +/* Halt the sp_input_clk at HM level */ +gpu_write (gpu,REG_A5XX_RBBM_CLOCK_CNTL ,0x00000055 ); +a5xx_set_hwcg (gpu, true); +/* Turn on sp_input_clk at HM level */ +gpu_rmw (gpu,REG_A5XX_RBBM_CLOCK_CNTL ,0xff ,0 ); +return 0 ; + } +/* Turn the RBCCU domain first to limit the chances of voltage droop */ gpu_write (gpu,REG_A5XX_GPMU_RBCCU_POWER_CNTL ,0x778000 );
@@ -1101,9 +1138,17 @@ static int a5xx_pm_resume(struct msm_gpu *gpu)static int a5xx_pm_suspend (struct msm_gpu *gpu) { +struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu); +u32 mask =0xf ; + +/* A510 has 3 XIN ports in VBIF */ +if (adreno_is_a510 (adreno_gpu)) + mask =0x7 ; +/* Clear the VBIF pipe before shutting down */ -gpu_write (gpu,REG_A5XX_VBIF_XIN_HALT_CTRL0 ,0xF ); -spin_until ((gpu_read (gpu,REG_A5XX_VBIF_XIN_HALT_CTRL1 ) &0xF ) ==0xF ); +gpu_write (gpu,REG_A5XX_VBIF_XIN_HALT_CTRL0 , mask); +spin_until ((gpu_read (gpu,REG_A5XX_VBIF_XIN_HALT_CTRL1 ) & + mask) == mask);gpu_write (gpu,REG_A5XX_VBIF_XIN_HALT_CTRL0 ,0 );
drivers/gpu/drm/msm/adreno/a5xx_power.c +7 -0
@@ -297,6 +297,10 @@ int a5xx_power_init(struct msm_gpu *gpu)struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu);int ret; +/* Not all A5xx chips have a GPMU */ +if (adreno_is_a510 (adreno_gpu)) +return 0 ; +/* Set up the limits management */ if (adreno_is_a530 (adreno_gpu))a530_lm_setup (gpu);
@@ -326,6 +330,9 @@ void a5xx_gpmu_ucode_init(struct msm_gpu *gpu)unsigned int *data, *ptr, *cmds;unsigned int cmds_size; +if (adreno_is_a510 (adreno_gpu)) +return ; +if (a5xx_gpu->gpmu_bo)return ;
drivers/gpu/drm/msm/adreno/adreno_device.c +15 -0
@@ -114,6 +114,21 @@ static const struct adreno_info gpulist[] = { .gmem = (SZ_1M + SZ_512K), .inactive_period = DRM_MSM_INACTIVE_PERIOD, .init = a4xx_gpu_init, + }, { + .rev = ADRENO_REV(5, 1, 0, ANY_ID), + .revn = 510, + .name = "A510", + .fw = { + [ADRENO_FW_PM4] = "a530_pm4.fw", + [ADRENO_FW_PFP] = "a530_pfp.fw", + }, + .gmem = SZ_256K, +/* +* Increase inactive period to 250 to avoid bouncing +* the GDSC which appears to make it grumpy +*/ + .inactive_period = 250, + .init = a5xx_gpu_init, }, { .rev = ADRENO_REV(5, 3, 0, 2), .revn = 530,
drivers/gpu/drm/msm/adreno/adreno_gpu.h +5 -0
@@ -206,6 +206,11 @@ static inline int adreno_is_a430(struct adreno_gpu *gpu)return gpu->revn ==430 ; } +static inline int adreno_is_a510 (struct adreno_gpu *gpu) +{ +return gpu->revn ==510 ; +} +static inline int adreno_is_a530 (struct adreno_gpu *gpu) {return gpu->revn ==530 ;
Signature · 6 lines
2.21.0 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno