drm/msm/dpu: Correct dpu encoder spinlock initialization (2e7b801e) · Commits · 戴 / test

dpu encoder spinlock should be initialized during dpu encoder init instead of dpu encoder setup which is part of modeset init. Signed-off-by:

Shubhashree Dhar <dhar@codeaurora.org> [seanpaul resolved conflict in old init removal and revised the commit message] Signed-off-by:

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -2221,8 +2221,6 @@ int dpu_encoder_setup(struct drm_device dev, struct drm_encoder enc,
		if (ret)
		goto fail;

		spin_lock_init(&dpu_enc->enc_spinlock);

		atomic_set(&dpu_enc->frame_done_timeout_ms, 0);
		timer_setup(&dpu_enc->frame_done_timer,
		dpu_encoder_frame_done_timeout, 0);
		@@ -2276,6 +2274,7 @@ struct drm_encoder dpu_encoder_init(struct drm_device dev,

		drm_encoder_helper_add(&dpu_enc->base, &dpu_encoder_helper_funcs);

		spin_lock_init(&dpu_enc->enc_spinlock);
		dpu_enc->enabled = false;

		return &dpu_enc->base;