Commit bfecbc2c authored Sep 03, 2024 by Dmitry Baryshkov Committed by Abhinav Kumar Oct 14, 2024

drm/msm/dpu: make sure phys resources are properly initialized



The commit b954fa6b ("drm/msm/dpu: Refactor rm iterator") removed
zero-init of the hw_ctl array, but didn't change the error condition,
that checked for hw_ctl[i] being NULL. At the same time because of the
early returns in case of an error dpu_encoder_phys might be left with
the resources assigned in the previous state. Rework assigning of hw_pp
/ hw_ctl to the dpu_encoder_phys in order to make sure they are always
set correctly.

Fixes: b954fa6b ("drm/msm/dpu: Refactor rm iterator")
Suggested-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/612233/
Link: https://lore.kernel.org/r/20240903-dpu-mode-config-width-v6-1-617e1ecc4b7a@linaro.org


Signed-off-by: Abhinav Kumar <quic_abhinavk@quicinc.com>

parent 15302579

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -1174,21 +1174,20 @@ static void dpu_encoder_virt_atomic_mode_set(struct drm_encoder *drm_enc,
		for (i = 0; i < dpu_enc->num_phys_encs; i++) {
		struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i];

		if (!dpu_enc->hw_pp[i]) {
		phys->hw_pp = dpu_enc->hw_pp[i];
		if (!phys->hw_pp) {
		DPU_ERROR_ENC(dpu_enc,
		"no pp block assigned at idx: %d\n", i);
		return;
		}

		if (!hw_ctl[i]) {
		phys->hw_ctl = i < num_ctl ? to_dpu_hw_ctl(hw_ctl[i]) : NULL;
		if (!phys->hw_ctl) {
		DPU_ERROR_ENC(dpu_enc,
		"no ctl block assigned at idx: %d\n", i);
		return;
		}

		phys->hw_pp = dpu_enc->hw_pp[i];
		phys->hw_ctl = to_dpu_hw_ctl(hw_ctl[i]);

		phys->cached_mode = crtc_state->adjusted_mode;
		if (phys->ops.atomic_mode_set)
		phys->ops.atomic_mode_set(phys, crtc_state, conn_state);