Add support for GPU DDR BW scaling
Subsystems (8)
v5 cover Add support for GPU DDR BW scaling
This series adds support for GPU DDR bandwidth scaling and is based on the bindings from Georgi [1]. This is mostly a rebase of Sharat's patches [2] on the tip of msm-next branch.
Changes from v4:
- Squashed a patch to another one to fix Jonathan's comment
- Add back the pm_runtime_get_if_in_use() check
Changes from v3:
- Rebased on top of Jonathan's patch which adds support for changing gpu freq through hfi on newer targets
- As suggested by Rob, left the icc_path intact for pre-a6xx GPUs
[1] https://kernel.googlesource.com/pub/scm/linux/kernel/git/vireshk/pm/+log/opp/linux-next/
[2] https://patchwork.freedesktop.org/series/75291/
Sharat Masetty (6):
dt-bindings: drm/msm/gpu: Document gpu opp table
drm: msm: a6xx: send opp instead of a frequency
drm: msm: a6xx: use dev_pm_opp_set_bw to scale DDR
arm64: dts: qcom: SDM845: Enable GPU DDR bw scaling
arm64: dts: qcom: sc7180: Add interconnects property for GPU
arm64: dts: qcom: sc7180: Add opp-peak-kBps to GPU opp
.../devicetree/bindings/display/msm/gpu.txt | 28 ++++++ arch/arm64/boot/dts/qcom/sc7180.dtsi | 9 ++ arch/arm64/boot/dts/qcom/sdm845.dtsi | 9 ++ drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 108 ++++++++++++--------- drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 2 +- drivers/gpu/drm/msm/msm_gpu.c | 3 +- drivers/gpu/drm/msm/msm_gpu.h | 3 +- 7 files changed, 112 insertions(+), 50 deletions(-)
Signature · 1 line
2.7.4
PATCH v5 1/6 dt-bindings: drm/msm/gpu: Document gpu opp table
From: Sharat Masetty <[email protected]>
Update documentation to list the gpu opp table bindings including the newly added "opp-peak-kBps" needed for GPU-DDR bandwidth scaling.
--- .../devicetree/bindings/display/msm/gpu.txt | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+)
Documentation/devicetree/bindings/display/msm/gpu.txt +28 -0
@@ -112,6 +112,34 @@ Example a6xx (with GMU): interconnects = <&rsc_hlos MASTER_GFX3D &rsc_hlos SLAVE_EBI1>; interconnect-names = "gfx-mem"; + gpu_opp_table: opp-table { + compatible = "operating-points-v2"; + + opp-430000000 { + opp-hz = /bits/ 64 <430000000>; + opp-level = <RPMH_REGULATOR_LEVEL_SVS_L1>; + opp-peak-kBps = <5412000>; + }; + + opp-355000000 { + opp-hz = /bits/ 64 <355000000>; + opp-level = <RPMH_REGULATOR_LEVEL_SVS>; + opp-peak-kBps = <3072000>; + }; + + opp-267000000 { + opp-hz = /bits/ 64 <267000000>; + opp-level = <RPMH_REGULATOR_LEVEL_LOW_SVS>; + opp-peak-kBps = <3072000>; + }; + + opp-180000000 { + opp-hz = /bits/ 64 <180000000>; + opp-level = <RPMH_REGULATOR_LEVEL_MIN_SVS>; + opp-peak-kBps = <1804000>; + }; + }; + qcom,gmu = <&gmu>; zap-shader {
Signature · 1 line
2.7.4
PATCH v5 2/6 drm: msm: a6xx: send opp instead of a frequency
In reply to Akhil P OommenFrom: Sharat Masetty <[email protected]>
This patch changes the plumbing to send the devfreq recommended opp rather than the frequency. Also consolidate and rearrange the code in a6xx to set the GPU frequency and the icc vote in preparation for the upcoming changes for GPU->DDR scaling votes.
--- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 89 +++++++++++++++++++---------------- drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 2 +- drivers/gpu/drm/msm/msm_gpu.c | 3 +- drivers/gpu/drm/msm/msm_gpu.h | 3 +- 4 files changed, 52 insertions(+), 45 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gmu.c +48 -41
@@ -103,17 +103,45 @@ bool a6xx_gmu_gx_is_on(struct a6xx_gmu *gmu) A6XX_GMU_SPTPRAC_PWR_CLK_STATUS_GX_HM_CLK_OFF)); } -static void __a6xx_gmu_set_freq (struct a6xx_gmu *gmu,int index) +void a6xx_gmu_set_freq (struct msm_gpu *gpu,struct dev_pm_opp *opp) { - struct a6xx_gpu *a6xx_gpu = container_of(gmu, struct a6xx_gpu, gmu); -struct adreno_gpu *adreno_gpu = &a6xx_gpu->base; -struct msm_gpu *gpu = &adreno_gpu->base; -int ret; +struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu); +struct a6xx_gpu *a6xx_gpu =to_a6xx_gpu (adreno_gpu); +struct a6xx_gmu *gmu = &a6xx_gpu->gmu; +u32 perf_index; +unsigned long gpu_freq; +int ret =0 ; + + gpu_freq =dev_pm_opp_get_freq (opp); + +if (gpu_freq == gmu->freq) +return ; + +for (perf_index =0 ; perf_index < gmu->nr_gpu_freqs -1 ; perf_index++) +if (gpu_freq == gmu->gpu_freqs[perf_index]) +break ; + + gmu->current_perf_index = perf_index; + gmu->freq = gmu->gpu_freqs[perf_index]; + +/* +* This can get called from devfreq while the hardware is idle. Don't +* bring up the power if it isn't already active +*/ +if (pm_runtime_get_if_in_use (gmu->dev) ==0 ) +return ; + +if (!gmu->legacy) { +a6xx_hfi_set_freq (gmu, perf_index); +icc_set_bw (gpu->icc_path,0 ,MBps_to_icc (7216 )); +pm_runtime_put (gmu->dev); +return ; + }gmu_write (gmu,REG_A6XX_GMU_DCVS_ACK_OPTION ,0 );gmu_write (gmu,REG_A6XX_GMU_DCVS_PERF_SETTING , - ((3 &0xf ) <<28 ) | index); + ((3 &0xf ) <<28 ) | perf_index);/* * Send an invalid index as a vote for the bus bandwidth and let the
@@ -134,37 +162,6 @@ static void __a6xx_gmu_set_freq(struct a6xx_gmu *gmu, int index)* for now leave it at max so that the performance is nominal. */ icc_set_bw (gpu->icc_path,0 ,MBps_to_icc (7216 )); -} - -void a6xx_gmu_set_freq (struct msm_gpu *gpu,unsigned long freq) -{ -struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu); -struct a6xx_gpu *a6xx_gpu =to_a6xx_gpu (adreno_gpu); -struct a6xx_gmu *gmu = &a6xx_gpu->gmu; -u32 perf_index =0 ; - -if (freq == gmu->freq) -return ; - -for (perf_index =0 ; perf_index < gmu->nr_gpu_freqs -1 ; perf_index++) -if (freq == gmu->gpu_freqs[perf_index]) -break ; - - gmu->current_perf_index = perf_index; - gmu->freq = gmu->gpu_freqs[perf_index]; - -/* -* This can get called from devfreq while the hardware is idle. Don't -* bring up the power if it isn't already active -*/ -if (pm_runtime_get_if_in_use (gmu->dev) ==0 ) -return ; - -if (gmu->legacy) -__a6xx_gmu_set_freq (gmu, perf_index); -else -a6xx_hfi_set_freq (gmu, perf_index); -pm_runtime_put (gmu->dev); }
@@ -839,6 +836,19 @@ static void a6xx_gmu_force_off(struct a6xx_gmu *gmu)a6xx_gmu_rpmh_off (gmu); } +static void a6xx_gmu_set_initial_freq (struct msm_gpu *gpu,struct a6xx_gmu *gmu) +{ +struct dev_pm_opp *gpu_opp; +unsigned long gpu_freq = gmu->gpu_freqs[gmu->current_perf_index]; + + gpu_opp =dev_pm_opp_find_freq_exact (&gpu->pdev->dev, gpu_freq, true); +if (IS_ERR_OR_NULL (gpu_opp)) +return ; + +a6xx_gmu_set_freq (gpu, gpu_opp); +dev_pm_opp_put (gpu_opp); +} +int a6xx_gmu_resume (struct a6xx_gpu *a6xx_gpu) {struct adreno_gpu *adreno_gpu = &a6xx_gpu->base;
@@ -898,10 +908,7 @@ int a6xx_gmu_resume(struct a6xx_gpu *a6xx_gpu)enable_irq (gmu->hfi_irq);/* Set the GPU to the current freq */ -if (gmu->legacy) -__a6xx_gmu_set_freq (gmu, gmu->current_perf_index); -else -a6xx_hfi_set_freq (gmu, gmu->current_perf_index); +a6xx_gmu_set_initial_freq (gpu, gmu);/* * "enable" the GX power domain which won't actually do anything but it
drivers/gpu/drm/msm/adreno/a6xx_gpu.h +1 -1
@@ -63,7 +63,7 @@ void a6xx_gmu_clear_oob(struct a6xx_gmu *gmu, enum a6xx_gmu_oob_state state);int a6xx_gmu_init (struct a6xx_gpu *a6xx_gpu,struct device_node *node);void a6xx_gmu_remove (struct a6xx_gpu *a6xx_gpu); -void a6xx_gmu_set_freq (struct msm_gpu *gpu,unsigned long freq); +void a6xx_gmu_set_freq (struct msm_gpu *gpu,struct dev_pm_opp *opp);unsigned long a6xx_gmu_get_freq (struct msm_gpu *gpu); void a6xx_show(struct msm_gpu *gpu, struct msm_gpu_state *state,
drivers/gpu/drm/msm/msm_gpu.c +1 -2
@@ -13,7 +13,6 @@#include <generated/utsrelease.h> #include <linux/string_helpers.h> -#include <linux/pm_opp.h> #include <linux/devfreq.h> #include <linux/devcoredump.h> #include <linux/sched/task.h>
@@ -34,7 +33,7 @@ static int msm_devfreq_target(struct device *dev, unsigned long *freq,return PTR_ERR (opp);if (gpu->funcs->gpu_set_freq) - gpu->funcs->gpu_set_freq (gpu, (u64)*freq); + gpu->funcs->gpu_set_freq (gpu, opp);else clk_set_rate (gpu->core_clk, *freq);
drivers/gpu/drm/msm/msm_gpu.h +2 -1
@@ -9,6 +9,7 @@#include <linux/clk.h> #include <linux/interconnect.h> +#include <linux/pm_opp.h> #include <linux/regulator/consumer.h> #include "msm_drv.h"
@@ -61,7 +62,7 @@ struct msm_gpu_funcs {struct msm_gpu_state *(*gpu_state_get)(struct msm_gpu *gpu);int (*gpu_state_put)(struct msm_gpu_state *state);unsigned long (*gpu_get_freq)(struct msm_gpu *gpu); -void (*gpu_set_freq)(struct msm_gpu *gpu,unsigned long freq); +void (*gpu_set_freq)(struct msm_gpu *gpu,struct dev_pm_opp *opp);struct msm_gem_address_space *(*create_address_space) (struct msm_gpu *gpu,struct platform_device *pdev); };
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v5 3/6 drm: msm: a6xx: use dev_pm_opp_set_bw to scale DDR
In reply to Akhil P OommenFrom: Sharat Masetty <[email protected]>
This patches replaces the previously used static DDR vote and uses dev_pm_opp_set_bw() to scale GPU->DDR bandwidth along with scaling GPU frequency. Also since the icc path voting is handled completely in the opp driver, remove the icc_path handle and its usage in the drm driver.
--- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gmu.c +17 -8
@@ -133,7 +133,7 @@ void a6xx_gmu_set_freq(struct msm_gpu *gpu, struct dev_pm_opp *opp)if (!gmu->legacy) {a6xx_hfi_set_freq (gmu, perf_index); -icc_set_bw (gpu->icc_path,0 ,MBps_to_icc (7216 )); +dev_pm_opp_set_bw (&gpu->pdev->dev, opp);pm_runtime_put (gmu->dev);return ; }
@@ -157,11 +157,7 @@ void a6xx_gmu_set_freq(struct msm_gpu *gpu, struct dev_pm_opp *opp)if (ret)dev_err (gmu->dev,"GMU set GPU frequency error: %d\n" , ret); -/* -* Eventually we will want to scale the path vote with the frequency but -* for now leave it at max so that the performance is nominal. -*/ -icc_set_bw (gpu->icc_path,0 ,MBps_to_icc (7216 )); +dev_pm_opp_set_bw (&gpu->pdev->dev, opp);pm_runtime_put (gmu->dev); }
@@ -849,6 +845,19 @@ static void a6xx_gmu_set_initial_freq(struct msm_gpu *gpu, struct a6xx_gmu *gmu)dev_pm_opp_put (gpu_opp); } +static void a6xx_gmu_set_initial_bw (struct msm_gpu *gpu,struct a6xx_gmu *gmu) +{ +struct dev_pm_opp *gpu_opp; +unsigned long gpu_freq = gmu->gpu_freqs[gmu->current_perf_index]; + + gpu_opp =dev_pm_opp_find_freq_exact (&gpu->pdev->dev, gpu_freq, true); +if (IS_ERR_OR_NULL (gpu_opp)) +return ; + +dev_pm_opp_set_bw (&gpu->pdev->dev, gpu_opp); +dev_pm_opp_put (gpu_opp); +} +int a6xx_gmu_resume (struct a6xx_gpu *a6xx_gpu) {struct adreno_gpu *adreno_gpu = &a6xx_gpu->base;
@@ -873,7 +882,7 @@ int a6xx_gmu_resume(struct a6xx_gpu *a6xx_gpu) }/* Set the bus quota to a reasonable value for boot */ -icc_set_bw (gpu->icc_path,0 ,MBps_to_icc (3072 )); +a6xx_gmu_set_initial_bw (gpu, gmu);/* Enable the GMU interrupt */ gmu_write (gmu,REG_A6XX_GMU_AO_HOST_INTERRUPT_CLR , ~0 );
@@ -1049,7 +1058,7 @@ int a6xx_gmu_stop(struct a6xx_gpu *a6xx_gpu)a6xx_gmu_shutdown (gmu);/* Remove the bus vote */ -icc_set_bw (gpu->icc_path,0 ,0 ); +dev_pm_opp_set_bw (&gpu->pdev->dev,NULL );/* * Make sure the GX domain is off before turning off the GMU (CX)
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v5 4/6 arm64: dts: qcom: SDM845: Enable GPU DDR bw scaling
In reply to Akhil P OommenFrom: Sharat Masetty <[email protected]>
This patch adds the interconnects property for the gpu node and the opp-peak-kBps property to the opps of the gpu opp table. This should help enable DDR bandwidth scaling dynamically and proportionally to the GPU frequency.
--- arch/arm64/boot/dts/qcom/sdm845.dtsi | 9 +++++++++ 1 file changed, 9 insertions(+)
arch/arm64/boot/dts/qcom/sdm845.dtsi +9 -0
@@ -3515,42 +3515,51 @@ qcom,gmu = <&gmu>; + interconnects = <&mem_noc MASTER_GFX3D &mem_noc SLAVE_EBI1>; + gpu_opp_table: opp-table { compatible = "operating-points-v2"; opp-710000000 { opp-hz = /bits/ 64 <710000000>; opp-level = <RPMH_REGULATOR_LEVEL_TURBO_L1>; + opp-peak-kBps = <7216000>; }; opp-675000000 { opp-hz = /bits/ 64 <675000000>; opp-level = <RPMH_REGULATOR_LEVEL_TURBO>; + opp-peak-kBps = <7216000>; }; opp-596000000 { opp-hz = /bits/ 64 <596000000>; opp-level = <RPMH_REGULATOR_LEVEL_NOM_L1>; + opp-peak-kBps = <6220000>; }; opp-520000000 { opp-hz = /bits/ 64 <520000000>; opp-level = <RPMH_REGULATOR_LEVEL_NOM>; + opp-peak-kBps = <6220000>; }; opp-414000000 { opp-hz = /bits/ 64 <414000000>; opp-level = <RPMH_REGULATOR_LEVEL_SVS_L1>; + opp-peak-kBps = <4068000>; }; opp-342000000 { opp-hz = /bits/ 64 <342000000>; opp-level = <RPMH_REGULATOR_LEVEL_SVS>; + opp-peak-kBps = <2724000>; }; opp-257000000 { opp-hz = /bits/ 64 <257000000>; opp-level = <RPMH_REGULATOR_LEVEL_LOW_SVS>; + opp-peak-kBps = <1648000>; }; }; };
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v5 5/6 arm64: dts: qcom: sc7180: Add interconnects property for GPU
In reply to Akhil P OommenFrom: Sharat Masetty <[email protected]>
This patch adds the interconnects property to the GPU node. This enables the GPU->DDR path bandwidth voting.
--- arch/arm64/boot/dts/qcom/sc7180.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/qcom/sc7180.dtsi +2 -0
@@ -1470,6 +1470,8 @@ operating-points-v2 = <&gpu_opp_table>; qcom,gmu = <&gmu>; + interconnects = <&gem_noc MASTER_GFX3D &mc_virt SLAVE_EBI1>; + gpu_opp_table: opp-table { compatible = "operating-points-v2";
Signature · 1 line
2.7.4
Re: [PATCH v5 5/6] arm64: dts: qcom: sc7180: Add interconnects property for GPU
Quoted 17 lines · Akhil P Oommen
From: Sharat Masetty <[email protected]>
This patch adds the interconnects property to the GPU node. This enables the
GPU->DDRpath bandwidth voting.Signed-off-by Sharat Masetty <[email protected]>Signed-off-by Akhil P Oommen <[email protected]>--- arch/arm64/boot/dts/qcom/sc7180.dtsi | 2 ++ 1 file changed, 2 insertions(+)arch/arm64/boot/dts/qcom/sc7180.dtsi +0
-0
arch/arm64/boot/dts/qcom/sc7180.dtsi line 1473
Quoted 4 lines
arch/arm64/boot/dts/qcom/sc7180.dtsi +1
-0@@ -1470,6 +1470,8 @@ operating-points-v2 = <&gpu_opp_table>; qcom,gmu = <&gmu>; + interconnects = <&gem_noc MASTER_GFX3D &mc_virt SLAVE_EBI1>;
I suppose this and the 845 dts patch should have:
interconnect-names = "gfx-mem";
(OTOH not having it was a good way to notice a bug in the driver handling the legacy case without having 'interconnect-names')
BR,
-R
Quoted 7 lines
arch/arm64/boot/dts/qcom/sc7180.dtsi +1
-1+ gpu_opp_table: opp-table { compatible = "operating-points-v2"; --2.7.4
PATCH v5 6/6 arm64: dts: qcom: sc7180: Add opp-peak-kBps to GPU opp
In reply to Akhil P OommenFrom: Sharat Masetty <[email protected]>
Add opp-peak-kBps bindings to the GPU opp table, listing the peak GPU -> DDR bandwidth requirement for each opp level. This will be used to scale the DDR bandwidth along with the GPU frequency dynamically.
--- arch/arm64/boot/dts/qcom/sc7180.dtsi | 7 +++++++ 1 file changed, 7 insertions(+)
arch/arm64/boot/dts/qcom/sc7180.dtsi +7 -0
@@ -1478,36 +1478,43 @@ opp-800000000 { opp-hz = /bits/ 64 <800000000>; opp-level = <RPMH_REGULATOR_LEVEL_TURBO>; + opp-peak-kBps = <8532000>; }; opp-650000000 { opp-hz = /bits/ 64 <650000000>; opp-level = <RPMH_REGULATOR_LEVEL_NOM_L1>; + opp-peak-kBps = <7216000>; }; opp-565000000 { opp-hz = /bits/ 64 <565000000>; opp-level = <RPMH_REGULATOR_LEVEL_NOM>; + opp-peak-kBps = <5412000>; }; opp-430000000 { opp-hz = /bits/ 64 <430000000>; opp-level = <RPMH_REGULATOR_LEVEL_SVS_L1>; + opp-peak-kBps = <5412000>; }; opp-355000000 { opp-hz = /bits/ 64 <355000000>; opp-level = <RPMH_REGULATOR_LEVEL_SVS>; + opp-peak-kBps = <3072000>; }; opp-267000000 { opp-hz = /bits/ 64 <267000000>; opp-level = <RPMH_REGULATOR_LEVEL_LOW_SVS>; + opp-peak-kBps = <3072000>; }; opp-180000000 { opp-hz = /bits/ 64 <180000000>; opp-level = <RPMH_REGULATOR_LEVEL_MIN_SVS>; + opp-peak-kBps = <1804000>; }; }; };
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 17 lines · Akhil P Oommen
This series adds support for GPU DDR bandwidth scaling and is based on the bindings from Georgi [1]. This is mostly a rebase of Sharat's patches [2] on the tip of msm-next branch.
Changes from v4:
- Squashed a patch to another one to fix Jonathan's comment
- Add back thepm_runtime_get_if_in_use()checkChanges from v3:
- Rebased on top of Jonathan's patch which adds support for changing gpu freq through hfi on newer targets
- As suggested by Rob, left theicc_pathintact for pre-a6xx GPUs[1] https://kernel.googlesource.com/pub/scm/linux/kernel/git/vireshk/pm/+log/opp/linux-next/
[2] https://patchwork.freedesktop.org/series/75291/
Quoted 7 lines
Sharat Masetty (6):
dt-bindings: drm/msm/gpu: Document gpu opp table
drm: msm: a6xx: send opp instead of a frequency
drm: msm: a6xx: usedev_pm_opp_set_bwto scale DDR
arm64: dts: qcom: SDM845: Enable GPU DDR bw scaling
arm64: dts: qcom: sc7180: Add interconnects property for GPU
arm64: dts: qcom: sc7180: Add opp-peak-kBps to GPU opp
I can take the first two into msm-next, the 3rd will need to wait until dev_pm_opp_set_bw() lands
Bjorn, I assume you take the last three?
BR,
-R
Quoted 13 lines
.../devicetree/bindings/display/msm/gpu.txt | 28 ++++++ arch/arm64/boot/dts/qcom/sc7180.dtsi | 9 ++ arch/arm64/boot/dts/qcom/sdm845.dtsi | 9 ++ drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 108 ++++++++++++--------- drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 2 +- drivers/gpu/drm/msm/msm_gpu.c | 3 +- drivers/gpu/drm/msm/msm_gpu.h | 3 +- 7 files changed, 112 insertions(+), 50 deletions(-)--
2.7.4
Quoted 2 lines · Rob Clark
I can take the first two into msm-next, the 3rd will need to wait until
dev_pm_opp_set_bw()lands
You can base that on a8351c12c6c7 in linux-next, I will make sure not to rebase it anymore.
Signature · 1 line
viresh
Quoted 8 lines · Viresh Kumar
Quoted 2 lines · Rob Clark
I can take the first two into msm-next, the 3rd will need to wait until
dev_pm_opp_set_bw()landsYou can base that on
a8351c12c6c7in linux-next, I will make sure not to rebase it anymore.
I can't really base on something newer than drm-next
BR,
-R
Quoted 8 lines · Rob Clark
Quoted 7 lines · Viresh Kumar
Quoted 2 lines · Rob Clark
I can take the first two into msm-next, the 3rd will need to wait until
dev_pm_opp_set_bw()landsYou can base that on
a8351c12c6c7in linux-next, I will make sure not to rebase it anymore.
This was 5.8-rc1 + 2 patches for OPP. That's all.
Quoted 3 lines
Quoted 1 line
I can't really base on something newer than drm-next
But you need the OPP dependency, isn't it ?
Signature · 1 line
viresh
Quoted 11 lines · Viresh Kumar
Quoted 8 lines · Rob Clark
Quoted 7 lines · Viresh Kumar
Quoted 2 lines · Rob Clark
I can take the first two into msm-next, the 3rd will need to wait until
dev_pm_opp_set_bw()landsYou can base that on
a8351c12c6c7in linux-next, I will make sure not to rebase it anymore.
Quoted 7 lines
This was 5.8-rc1 + 2 patches for OPP. That's all.
Quoted 3 lines
Quoted 1 line
I can't really base on something newer than drm-next
But you need the OPP dependency, isn't it ?
With your ack, I can add the patch the dev_pm_opp_set_bw patch to my tree and merge it via msm-next -> drm-next -> linus
Otherwise I can send a second later pull req that adds the final patch after has rebased to 5.9-rc1 (by which point the opp next tree will have presumably been merged
BR,
-R
Quoted 3 lines
--
viresh
Quoted 2 lines · Rob Clark
With your ack, I can add the patch the
dev_pm_opp_set_bwpatch to my tree and merge it via msm-next -> drm-next -> linus
I wanted to send it via my tree, but its okay. Pick this patch from linux-next and add my Ack, I will drop it after that.
a8351c12c6c7 OPP: Add and export helper to set bandwidth
Quoted 3 lines
Otherwise I can send a second later pull req that adds the final patch after has rebased to 5.9-rc1 (by which point the opp next tree will have presumably been merged
The PM stuff gets pushed fairly early and so I was asking you to rebase just on my tree, so you could have sent the pull request right after the PM tree landed there instead of waiting for rc1.
But its fine now.
Signature · 1 line
viresh
Quoted 9 lines · Viresh Kumar
Quoted 2 lines · Rob Clark
With your ack, I can add the patch the
dev_pm_opp_set_bwpatch to my tree and merge it via msm-next -> drm-next -> linusI wanted to send it via my tree, but its okay. Pick this patch from linux-next and add my Ack, I will drop it after that.
a8351c12c6c7OPP: Add and export helper to set bandwidth
Thanks, I'll do that
Quoted 8 lines
Quoted 4 lines
Otherwise I can send a second later pull req that adds the final patch after has rebased to 5.9-rc1 (by which point the opp next tree will have presumably been merged
The PM stuff gets pushed fairly early and so I was asking you to rebase just on my tree, so you could have sent the pull request right after the PM tree landed there instead of waiting for rc1.
I guess I should have explained that my tree gets pulled first into drm-next, which then gets pulled by Linus.
BR,
-R
Quoted 4 lines
But its fine now.
--
viresh
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 19 lines · Rob Clark
Quoted 9 lines · Viresh Kumar
Quoted 2 lines · Rob Clark
With your ack, I can add the patch the
dev_pm_opp_set_bwpatch to my tree and merge it via msm-next -> drm-next -> linusI wanted to send it via my tree, but its okay. Pick this patch from linux-next and add my Ack, I will drop it after that.
a8351c12c6c7OPP: Add and export helper to set bandwidthThanks, I'll do that
Quoted 5 lines
Quoted 4 lines
Otherwise I can send a second later pull req that adds the final patch after has rebased to 5.9-rc1 (by which point the opp next tree will have presumably been merged
Quoted 6 lines
Quoted 3 lines
The PM stuff gets pushed fairly early and so I was asking you to rebase just on my tree, so you could have sent the pull request right after the PM tree landed there instead of waiting for rc1.
I guess I should have explained that my tree gets pulled first into drm-next, which then gets pulled by Linus.
Yeah either topic tree or acks for merging in the other branch. No rebasing in the middle of the merge window, that's rather uncool. -Daniel
Quoted 12 lines
BR,
-RQuoted 4 lines
But its fine now.
--
viresh_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Quoted 8 lines · Viresh Kumar
Quoted 2 lines · Rob Clark
With your ack, I can add the patch the
dev_pm_opp_set_bwpatch to my tree and merge it via msm-next -> drm-next -> linusI wanted to send it via my tree, but its okay. Pick this patch from linux-next and add my Ack, I will drop it after that.
a8351c12c6c7OPP: Add and export helper to set bandwidth
Oops, sorry for the trouble but this needs to go via my tree only :(
I maintain two different branches, one for OPP and another one for cpufreq. There was no dependency within the OPP branch and so I dropped it that day and asked you to take it.
But when I tried to send a pull request today I realised that one of the qcom patches in the cpufreq branch is dependent on it and I need to keep this patch in my tree.
Signature · 1 line
viresh
Quoted 13 lines · Viresh Kumar
Quoted 8 lines · Viresh Kumar
Quoted 2 lines · Rob Clark
With your ack, I can add the patch the
dev_pm_opp_set_bwpatch to my tree and merge it via msm-next -> drm-next -> linusI wanted to send it via my tree, but its okay. Pick this patch from linux-next and add my Ack, I will drop it after that.
a8351c12c6c7OPP: Add and export helper to set bandwidthOops, sorry for the trouble but this needs to go via my tree only :(
Quoted 7 lines
I maintain two different branches, one for OPP and another one for cpufreq. There was no dependency within the OPP branch and so I dropped it that day and asked you to take it.
But when I tried to send a pull request today I realised that one of the qcom patches in the cpufreq branch is dependent on it and I need to keep this patch in my tree.
Hmm, I've already sent my pull request to Dave, dropping the patch would require force-push and sending a new PR. Which I can do if Dave prefers. OTOH I guess it isn't the end of the world if the patch is merged via two different trees.
BR,
-R
Quoted 4 lines · Rob Clark
Hmm, I've already sent my pull request to Dave, dropping the patch would require force-push and sending a new PR. Which I can do if Dave prefers. OTOH I guess it isn't the end of the world if the patch is merged via two different trees.
I don't think a patch can go via two trees, as that would have two sha keys for the same code.
Though it is fine for a patch to go via two different trees if we make sure the same sha key is used for both.
Will it be possible for you to provide a branch/tag of your branch that I can base stuff of ?
Signature · 1 line
viresh
Quoted 9 lines · Viresh Kumar
Quoted 4 lines · Rob Clark
Hmm, I've already sent my pull request to Dave, dropping the patch would require force-push and sending a new PR. Which I can do if Dave prefers. OTOH I guess it isn't the end of the world if the patch is merged via two different trees.
I don't think a patch can go via two trees, as that would have two sha keys for the same code.
it looks weird in the history, but other than that I think it is fine.. at least I see it happen somewhat regularly with fixes in drm
Quoted 5 lines
Though it is fine for a patch to go via two different trees if we make sure the same sha key is used for both.
Will it be possible for you to provide a branch/tag of your branch that I can base stuff of ?
You could use https://gitlab.freedesktop.org/drm/msm/-/commits/msm-next/
(or the tag drm-msm-next-2020-07-29), which already has the OPP patch. I've been trying to avoid force-pushing that because downstream trees are already pulling from that.
BR,
-R
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 7 lines · Viresh Kumar
Quoted 4 lines · Rob Clark
Hmm, I've already sent my pull request to Dave, dropping the patch would require force-push and sending a new PR. Which I can do if Dave prefers. OTOH I guess it isn't the end of the world if the patch is merged via two different trees.
Quoted 9 lines
I don't think a patch can go via two trees, as that would have two sha keys for the same code.
Though it is fine for a patch to go via two different trees if we make sure the same sha key is used for both.
Will it be possible for you to provide a branch/tag of your branch that I can base stuff of ?
Ok, I sent a v2 pull req that dropped the OPP patch. Both are tagged so Dave can use either version, so I guess you two can coordinate this
BR,
-R
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel