On Mon, Jun 24, 2019 at 11:57:12AM +0530, Shubhashree Dhar wrote: > dpu encoder spinlock should be initialized during dpu encoder > init instead of dpu encoder setup which is part of commit. > There are chances that vblank control uses the uninitialized > spinlock if not initialized during encoder init. > > Change-Id: I5a18b95fa47397c834a266b22abf33a517b03a4e > Signed-off-by: Shubhashree Dhar <dhar@xxxxxxxxxxxxxx> Thanks for your patch. I've resolved the conflict and tweaked the commit message a bit to reflect current reality. Applied to drm-misc-fixes for 5.3 Sean > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > index 5f085b5..22938c7 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > @@ -2195,8 +2195,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, 0); > timer_setup(&dpu_enc->frame_done_timer, > dpu_encoder_frame_done_timeout, 0); > @@ -2250,6 +2248,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; > -- > 1.9.1 > -- Sean Paul, Software Engineer, Google / Chromium OS
