drm/msm/dpu: don't overwrite CTL_MERGE_3D_ACTIVE register
authorDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Fri, 7 Mar 2025 06:24:49 +0000 (08:24 +0200)
committerDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Thu, 1 May 2025 20:21:57 +0000 (23:21 +0300)
commitef595c04e843592481443b63e7790f44d52a5a19
tree0193931e5a479a492d472ca2c22c4e1fc3f0289a
parent844e31bbaef7c8a6ff2c0fbac45c0c85b5484482
drm/msm/dpu: don't overwrite CTL_MERGE_3D_ACTIVE register

In case of complex pipelines (e.g. the forthcoming quad-pipe) the DPU
might use more that one MERGE_3D block for a single output.  Follow the
pattern and extend the CTL_MERGE_3D_ACTIVE active register instead of
simply writing new value there. Currently at most one MERGE_3D block is
being used, so this has no impact on existing targets.

Reviewed-by: Marijn Suijten <marijn.suijten@somainline.org>
Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8550-QRD
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Jessica Zhang <quic_jesszhan@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/641580/
Link: https://lore.kernel.org/r/20250307-dpu-active-ctl-v3-1-5d20655f10ca@linaro.org
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c