From: liuxinliang Subject: Re: [RFC][PATCH v2] drm: kirin: Add a mutex to avoid fb initialization race Date: Sat, 25 Feb 2017 09:39:16 +0800 Message-ID: <58B0E044.6010905@hisilicon.com> References: <1487985916-29450-1-git-send-email-john.stultz@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1487985916-29450-1-git-send-email-john.stultz@linaro.org> Sender: linux-kernel-owner@vger.kernel.org To: John Stultz , lkml Cc: Rongrong Zou , Xinwei Kong , Chen Feng , David Airlie , Daniel Vetter , Sean Paul , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org Hi John, The patch seems good to me, except one minus comment. Maybe change fb_lock to fbdev_lock would be better. Thanks, -xinliang On 2017/2/25 9:25, John Stultz wrote: > In some cases I've been seeing a race where two framebuffers > would be initialized, as kirin_fbdev_output_poll_changed() > might get called quickly in succession, resulting in the > initialization happening twice. This could cause the system > to boot up with a blank screen. > > This patch adds a simple mutex to serialize it and seems to > avoid the race. > > Suggestions or feedback would be greatly appreciated! > > Cc: Xinliang Liu > Cc: Rongrong Zou > Cc: Xinwei Kong > Cc: Chen Feng > Cc: David Airlie > Cc: Daniel Vetter > Cc: Sean Paul > Cc: dri-devel@lists.freedesktop.org > Signed-off-by: John Stultz > --- > drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 4 ++++ > drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 1 + > 2 files changed, 5 insertions(+) > > diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c > index 7ec93ae..b83556a 100644 > --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c > +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c > @@ -55,6 +55,7 @@ static void kirin_fbdev_output_poll_changed(struct drm_device *dev) > { > struct kirin_drm_private *priv = dev->dev_private; > > + mutex_lock(&priv->fb_lock); > if (priv->fbdev) { > drm_fbdev_cma_hotplug_event(priv->fbdev); > } else { > @@ -63,6 +64,7 @@ static void kirin_fbdev_output_poll_changed(struct drm_device *dev) > if (IS_ERR(priv->fbdev)) > priv->fbdev = NULL; > } > + mutex_unlock(&priv->fb_lock); > } > #endif > > @@ -95,6 +97,8 @@ static int kirin_drm_kms_init(struct drm_device *dev) > if (!priv) > return -ENOMEM; > > + mutex_init(&priv->fb_lock); > + > dev->dev_private = priv; > dev_set_drvdata(dev->dev, dev); > > diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h > index 7f60c649..9b6d2b1 100644 > --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h > +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h > @@ -23,6 +23,7 @@ struct kirin_drm_private { > #ifdef CONFIG_DRM_FBDEV_EMULATION > struct drm_fbdev_cma *fbdev; > #endif > + struct mutex fb_lock; > }; > > extern const struct kirin_dc_ops ade_dc_ops;