drm/msm/disp/dpu1: program 3d_merge only if block is attached
PATCH 1/1 drm/msm/disp/dpu1: program 3d_merge only if block is attached
Update the 3d merge as active in the data path only if the hw block is selected in the configuration.
Reported-by Stephen Boyd <[email protected]>
Signed-off-by Kalyan Thota <[email protected]>
--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +3 -1
@@ -496,7 +496,9 @@ static void dpu_hw_ctl_intf_cfg_v1(struct dpu_hw_ctl *ctx,DPU_REG_WRITE (c,CTL_TOP , mode_sel);DPU_REG_WRITE (c,CTL_INTF_ACTIVE , intf_active); -DPU_REG_WRITE (c,CTL_MERGE_3D_ACTIVE ,BIT (cfg->merge_3d -MERGE_3D_0 )); +if (cfg->merge_3d) +DPU_REG_WRITE (c,CTL_MERGE_3D_ACTIVE , +BIT (cfg->merge_3d -MERGE_3D_0 )); } static void dpu_hw_ctl_intf_cfg(struct dpu_hw_ctl *ctx,
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 5 lines · Kalyan Thota
Update the 3d merge as active in the data path only if the hw block is selected in the configuration.
Reported-by Stephen Boyd <[email protected]>
Thanks, I've added:
Fixes 73bfb790ac78 ("msm:disp:dpu1: setup display datapath for SC7180 target")
Quoted 23 lines
Signed-off-by Kalyan Thota <[email protected]>--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +3
-2@@ -496,7 +496,9 @@ static void dpu_hw_ctl_intf_cfg_v1(struct dpu_hw_ctl *ctx,DPU_REG_WRITE (c,CTL_TOP , mode_sel);DPU_REG_WRITE (c,CTL_INTF_ACTIVE , intf_active); -DPU_REG_WRITE (c,CTL_MERGE_3D_ACTIVE ,BIT (cfg->merge_3d -MERGE_3D_0 )); +if (cfg->merge_3d) +DPU_REG_WRITE (c,CTL_MERGE_3D_ACTIVE , +BIT (cfg->merge_3d -MERGE_3D_0 )); } static void dpu_hw_ctl_intf_cfg(struct dpu_hw_ctl *ctx, --2.7.4
This patch was applied to qcom/linux.git (refs/heads/for-next):
Hello:
This patch was applied to qcom/linux.git (refs/heads/for-next):
Quoted 8 lines · On Fri, 2 Apr 2021 04:54:53 -0700 you wrote:
Update the 3d merge as active in the data path only if the hw block is selected in the configuration.
Reported-by Stephen Boyd <[email protected]>Signed-off-by Kalyan Thota <[email protected]>--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Here is the summary with links:
- [v1] drm/msm/disp/dpu1: program 3d_merge only if block is attached
https://git.kernel.org/qcom/c/12aca1ce9ee3
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html