Commit ef3ac3ae authored by Abhinav Kumar's avatar Abhinav Kumar
Browse files

drm/msm/dpu: populate wb or intf before reset_intf_cfg 



dpu_encoder_helper_phys_cleanup() was not populating neither
wb or intf to the intf_cfg before calling the reset_intf_cfg().

This causes the reset of the active bits of wb/intf to be
skipped which is incorrect.

Fix this by populating the relevant wb or intf indices correctly.

Fixes: ae4d721c ("drm/msm/dpu: add an API to reset the encoder related hw blocks")
Signed-off-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Reviewed-by: default avatarJessica Zhang <quic_jesszhan@quicinc.com>
Tested-by: Jessica Zhang <quic_jesszhan@quicinc.com> # Trogdor (SC8170)
Patchwork: https://patchwork.freedesktop.org/patch/494298/
Link: https://lore.kernel.org/r/1657912468-17254-1-git-send-email-quic_abhinavk@quicinc.com
parent 2f25a1fb

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

+6 −0
Original line number Diff line number Diff line
@@ -2061,6 +2061,12 @@ void dpu_encoder_helper_phys_cleanup(struct dpu_encoder_phys *phys_enc) 


	intf_cfg.stream_sel = 0; /* Don't care value for video mode */

	intf_cfg.mode_3d = dpu_encoder_helper_get_3d_blend_mode(phys_enc);



	if (phys_enc->hw_intf)

		intf_cfg.intf = phys_enc->hw_intf->idx;

	if (phys_enc->hw_wb)

		intf_cfg.wb = phys_enc->hw_wb->idx;



	if (phys_enc->hw_pp->merge_3d)

		intf_cfg.merge_3d = phys_enc->hw_pp->merge_3d->idx;