| Message ID | 20200612160056.2082681-1-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/8] drm/atomic-helper: reset vblank on crtc reset | expand |
On Fri, Jun 12, 2020 at 06:00:49PM +0200, Daniel Vetter wrote: > Only when vblanks are supported ofc. > > Some drivers do this already, but most unfortunately missed it. This > opens up bugs after driver load, before the crtc is enabled for the > first time. syzbot spotted this when loading vkms as a secondary > output. Given how many drivers are buggy it's best to solve this once > and for all in shared helper code. > > Aside from moving the few existing calls to drm_crtc_vblank_reset into > helpers (i915 doesn't use helpers, so keeps its own) I think the > regression risk is minimal: atomic helpers already rely on drivers > calling drm_crtc_vblank_on/off correctly in their hooks when they > support vblanks. And driver that's failing to handle vblanks after > this is missing those calls already, and vblanks could only work by > accident when enabling a CRTC for the first time right after boot. > > Big thanks to Tetsuo for helping track down what's going wrong here. > > There's only a few drivers which already had the necessary call and > needed some updating: > - komeda, atmel and tidss also needed to be changed to call > __drm_atomic_helper_crtc_reset() intead of open coding it > - tegra and msm even had it in the same place already, just code > motion, and malidp already uses __drm_atomic_helper_crtc_reset(). > > Only call left is in i915, which doesn't use drm_mode_config_reset, > but has its own fastboot infrastructure. So that's the only case where > we actually want this in the driver still. > > I've also reviewed all other drivers which set up vblank support with > drm_vblank_init. After the previous patch fixing mxsfb all atomic > drivers do call drm_crtc_vblank_on/off as they should, the remaining > drivers are either legacy kms or legacy dri1 drivers, so not affected > by this change to atomic helpers. > > v2: Use the drm_dev_has_vblank() helper. > > v3: Laurent pointed out that omap and rcar-du used drm_crtc_vblank_off > instead of drm_crtc_vblank_reset. Adjust them too. > > v4: Laurent noticed that rcar-du and omap open-code their crtc reset > and hence would actually be broken by this patch now. So fix them up > by reusing the helpers, which brings the drm_crtc_vblank_reset() back. > > Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> > Acked-by: Liviu Dudau <liviu.dudau@arm.com> > Acked-by: Thierry Reding <treding@nvidia.com> > Link: https://syzkaller.appspot.com/bug?id=0ba17d70d062b2595e1f061231474800f076c7cb > Reported-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> > Reported-by: syzbot+0871b14ca2e2fb64f6e3@syzkaller.appspotmail.com > Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> > Cc: "James (Qian) Wang" <james.qian.wang@arm.com> > Cc: Liviu Dudau <liviu.dudau@arm.com> > Cc: Mihail Atanassov <mihail.atanassov@arm.com> > Cc: Brian Starkey <brian.starkey@arm.com> > Cc: Sam Ravnborg <sam@ravnborg.org> > Cc: Boris Brezillon <bbrezillon@kernel.org> > Cc: Nicolas Ferre <nicolas.ferre@microchip.com> > Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> > Cc: Ludovic Desroches <ludovic.desroches@microchip.com> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Cc: Maxime Ripard <mripard@kernel.org> > Cc: Thomas Zimmermann <tzimmermann@suse.de> > Cc: David Airlie <airlied@linux.ie> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: Thierry Reding <thierry.reding@gmail.com> > Cc: Jonathan Hunter <jonathanh@nvidia.com> > Cc: Jyri Sarha <jsarha@ti.com> > Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> > Cc: Rob Clark <robdclark@gmail.com> > Cc: Sean Paul <seanpaul@chromium.org> > Cc: Brian Masney <masneyb@onstation.org> > Cc: Emil Velikov <emil.velikov@collabora.com> > Cc: zhengbin <zhengbin13@huawei.com> > Cc: Thomas Gleixner <tglx@linutronix.de> > Cc: linux-tegra@vger.kernel.org > Cc: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-renesas-soc@vger.kernel.org > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Acked-by: Maxime Ripard <mripard@kernel.org> Maxime
Hi Daniel, Thank you for the patch. On Fri, Jun 12, 2020 at 06:00:49PM +0200, Daniel Vetter wrote: > Only when vblanks are supported ofc. > > Some drivers do this already, but most unfortunately missed it. This > opens up bugs after driver load, before the crtc is enabled for the > first time. syzbot spotted this when loading vkms as a secondary > output. Given how many drivers are buggy it's best to solve this once > and for all in shared helper code. > > Aside from moving the few existing calls to drm_crtc_vblank_reset into > helpers (i915 doesn't use helpers, so keeps its own) I think the > regression risk is minimal: atomic helpers already rely on drivers > calling drm_crtc_vblank_on/off correctly in their hooks when they > support vblanks. And driver that's failing to handle vblanks after > this is missing those calls already, and vblanks could only work by > accident when enabling a CRTC for the first time right after boot. > > Big thanks to Tetsuo for helping track down what's going wrong here. > > There's only a few drivers which already had the necessary call and > needed some updating: > - komeda, atmel and tidss also needed to be changed to call > __drm_atomic_helper_crtc_reset() intead of open coding it > - tegra and msm even had it in the same place already, just code > motion, and malidp already uses __drm_atomic_helper_crtc_reset(). Should you mention rcar-du and omapdrm here ? > Only call left is in i915, which doesn't use drm_mode_config_reset, > but has its own fastboot infrastructure. So that's the only case where > we actually want this in the driver still. > > I've also reviewed all other drivers which set up vblank support with > drm_vblank_init. After the previous patch fixing mxsfb all atomic > drivers do call drm_crtc_vblank_on/off as they should, the remaining > drivers are either legacy kms or legacy dri1 drivers, so not affected > by this change to atomic helpers. > > v2: Use the drm_dev_has_vblank() helper. > > v3: Laurent pointed out that omap and rcar-du used drm_crtc_vblank_off > instead of drm_crtc_vblank_reset. Adjust them too. > > v4: Laurent noticed that rcar-du and omap open-code their crtc reset > and hence would actually be broken by this patch now. So fix them up > by reusing the helpers, which brings the drm_crtc_vblank_reset() back. > > Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> > Acked-by: Liviu Dudau <liviu.dudau@arm.com> > Acked-by: Thierry Reding <treding@nvidia.com> > Link: https://syzkaller.appspot.com/bug?id=0ba17d70d062b2595e1f061231474800f076c7cb > Reported-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> > Reported-by: syzbot+0871b14ca2e2fb64f6e3@syzkaller.appspotmail.com > Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> > Cc: "James (Qian) Wang" <james.qian.wang@arm.com> > Cc: Liviu Dudau <liviu.dudau@arm.com> > Cc: Mihail Atanassov <mihail.atanassov@arm.com> > Cc: Brian Starkey <brian.starkey@arm.com> > Cc: Sam Ravnborg <sam@ravnborg.org> > Cc: Boris Brezillon <bbrezillon@kernel.org> > Cc: Nicolas Ferre <nicolas.ferre@microchip.com> > Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> > Cc: Ludovic Desroches <ludovic.desroches@microchip.com> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Cc: Maxime Ripard <mripard@kernel.org> > Cc: Thomas Zimmermann <tzimmermann@suse.de> > Cc: David Airlie <airlied@linux.ie> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: Thierry Reding <thierry.reding@gmail.com> > Cc: Jonathan Hunter <jonathanh@nvidia.com> > Cc: Jyri Sarha <jsarha@ti.com> > Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> > Cc: Rob Clark <robdclark@gmail.com> > Cc: Sean Paul <seanpaul@chromium.org> > Cc: Brian Masney <masneyb@onstation.org> > Cc: Emil Velikov <emil.velikov@collabora.com> > Cc: zhengbin <zhengbin13@huawei.com> > Cc: Thomas Gleixner <tglx@linutronix.de> > Cc: linux-tegra@vger.kernel.org > Cc: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-renesas-soc@vger.kernel.org > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > --- > drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 7 ++----- > drivers/gpu/drm/arm/malidp_drv.c | 1 - > drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 7 ++----- > drivers/gpu/drm/drm_atomic_state_helper.c | 4 ++++ > drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 2 -- > drivers/gpu/drm/omapdrm/omap_crtc.c | 8 +++++--- > drivers/gpu/drm/omapdrm/omap_drv.c | 4 ---- > drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 6 +----- > drivers/gpu/drm/tegra/dc.c | 1 - > drivers/gpu/drm/tidss/tidss_crtc.c | 3 +-- > drivers/gpu/drm/tidss/tidss_kms.c | 4 ---- > 11 files changed, 15 insertions(+), 32 deletions(-) > > diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c > index 56bd938961ee..f33418d6e1a0 100644 > --- a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c > +++ b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c > @@ -492,10 +492,8 @@ static void komeda_crtc_reset(struct drm_crtc *crtc) > crtc->state = NULL; > > state = kzalloc(sizeof(*state), GFP_KERNEL); > - if (state) { > - crtc->state = &state->base; > - crtc->state->crtc = crtc; > - } > + if (state) > + __drm_atomic_helper_crtc_reset(crtc, &state->base); > } > > static struct drm_crtc_state * > @@ -616,7 +614,6 @@ static int komeda_crtc_add(struct komeda_kms_dev *kms, > return err; > > drm_crtc_helper_add(crtc, &komeda_crtc_helper_funcs); > - drm_crtc_vblank_reset(crtc); > > crtc->port = kcrtc->master->of_output_port; > > diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c > index 6feda7cb37a6..c9e1ee84b4e8 100644 > --- a/drivers/gpu/drm/arm/malidp_drv.c > +++ b/drivers/gpu/drm/arm/malidp_drv.c > @@ -861,7 +861,6 @@ static int malidp_bind(struct device *dev) > drm->irq_enabled = true; > > ret = drm_vblank_init(drm, drm->mode_config.num_crtc); > - drm_crtc_vblank_reset(&malidp->crtc); > if (ret < 0) { > DRM_ERROR("failed to initialise vblank\n"); > goto vblank_fail; > diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c > index 10985134ce0b..ce246b96330b 100644 > --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c > +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c > @@ -411,10 +411,8 @@ static void atmel_hlcdc_crtc_reset(struct drm_crtc *crtc) > } > > state = kzalloc(sizeof(*state), GFP_KERNEL); > - if (state) { > - crtc->state = &state->base; > - crtc->state->crtc = crtc; > - } > + if (state) > + __drm_atomic_helper_crtc_reset(crtc, &state->base); > } > > static struct drm_crtc_state * > @@ -528,7 +526,6 @@ int atmel_hlcdc_crtc_create(struct drm_device *dev) > } > > drm_crtc_helper_add(&crtc->base, &lcdc_crtc_helper_funcs); > - drm_crtc_vblank_reset(&crtc->base); > > drm_mode_crtc_set_gamma_size(&crtc->base, ATMEL_HLCDC_CLUT_SIZE); > drm_crtc_enable_color_mgmt(&crtc->base, 0, false, > diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/drm_atomic_state_helper.c > index 8fce6a115dfe..9ad74045158e 100644 > --- a/drivers/gpu/drm/drm_atomic_state_helper.c > +++ b/drivers/gpu/drm/drm_atomic_state_helper.c > @@ -32,6 +32,7 @@ > #include <drm/drm_device.h> > #include <drm/drm_plane.h> > #include <drm/drm_print.h> > +#include <drm/drm_vblank.h> > #include <drm/drm_writeback.h> > > #include <linux/slab.h> > @@ -93,6 +94,9 @@ __drm_atomic_helper_crtc_reset(struct drm_crtc *crtc, > if (crtc_state) > __drm_atomic_helper_crtc_state_reset(crtc_state, crtc); > > + if (drm_dev_has_vblank(crtc->dev)) > + drm_crtc_vblank_reset(crtc); > + > crtc->state = crtc_state; > } > EXPORT_SYMBOL(__drm_atomic_helper_crtc_reset); > diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c > index e152016a6a7d..c39dad151bb6 100644 > --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c > +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c > @@ -1117,8 +1117,6 @@ static void mdp5_crtc_reset(struct drm_crtc *crtc) > mdp5_crtc_destroy_state(crtc, crtc->state); > > __drm_atomic_helper_crtc_reset(crtc, &mdp5_cstate->base); > - > - drm_crtc_vblank_reset(crtc); > } > > static const struct drm_crtc_funcs mdp5_crtc_funcs = { > diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c > index fce7e944a280..6d40914675da 100644 > --- a/drivers/gpu/drm/omapdrm/omap_crtc.c > +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c > @@ -697,14 +697,16 @@ static int omap_crtc_atomic_get_property(struct drm_crtc *crtc, > > static void omap_crtc_reset(struct drm_crtc *crtc) > { > + struct omap_crtc_state *state; > + > if (crtc->state) > __drm_atomic_helper_crtc_destroy_state(crtc->state); > > kfree(crtc->state); > - crtc->state = kzalloc(sizeof(struct omap_crtc_state), GFP_KERNEL); > > - if (crtc->state) > - crtc->state->crtc = crtc; > + state = kzalloc(sizeof(*state), GFP_KERNEL); > + if (state) > + __drm_atomic_helper_crtc_reset(crtc, &state->base); > } > > static struct drm_crtc_state * > diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c > index 242d28281784..4526967978b7 100644 > --- a/drivers/gpu/drm/omapdrm/omap_drv.c > +++ b/drivers/gpu/drm/omapdrm/omap_drv.c > @@ -595,7 +595,6 @@ static int omapdrm_init(struct omap_drm_private *priv, struct device *dev) > { > const struct soc_device_attribute *soc; > struct drm_device *ddev; > - unsigned int i; > int ret; > > DBG("%s", dev_name(dev)); > @@ -642,9 +641,6 @@ static int omapdrm_init(struct omap_drm_private *priv, struct device *dev) > goto err_cleanup_modeset; > } > > - for (i = 0; i < priv->num_pipes; i++) > - drm_crtc_vblank_off(priv->pipes[i].crtc); > - > omap_fbdev_init(ddev); > > drm_kms_helper_poll_init(ddev); > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c > index d73e88ddecd0..fe86a3e67757 100644 > --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c > +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c > @@ -975,8 +975,7 @@ static void rcar_du_crtc_reset(struct drm_crtc *crtc) > state->crc.source = VSP1_DU_CRC_NONE; > state->crc.index = 0; > > - crtc->state = &state->state; > - crtc->state->crtc = crtc; > + __drm_atomic_helper_crtc_reset(crtc, &state->state); > } > > static int rcar_du_crtc_enable_vblank(struct drm_crtc *crtc) > @@ -1271,9 +1270,6 @@ int rcar_du_crtc_create(struct rcar_du_group *rgrp, unsigned int swindex, > > drm_crtc_helper_add(crtc, &crtc_helper_funcs); > > - /* Start with vertical blanking interrupt reporting disabled. */ > - drm_crtc_vblank_off(crtc); > - Could this cause an issue, as the interrupt handler can now be registered with the interrupt left enabled in the hardware after a reboot, while drm_crtc_vblank_off() would disable it ? It's something that should likely be handled elsewhere in the driver, with all interrupts disabled explicitly early in probe, and I don't think the driver handles enabled interrupts very well today, so it's not a blocker for me: Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> I would however appreciate your thoughts on this topic, to know if my understanding is correct (and if this issue could affect other drivers). > /* Register the interrupt handler. */ > if (rcar_du_has(rcdu, RCAR_DU_FEATURE_CRTC_IRQ_CLOCK)) { > /* The IRQ's are associated with the CRTC (sw)index. */ > diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c > index 83f31c6e891c..9b308b572eac 100644 > --- a/drivers/gpu/drm/tegra/dc.c > +++ b/drivers/gpu/drm/tegra/dc.c > @@ -1168,7 +1168,6 @@ static void tegra_crtc_reset(struct drm_crtc *crtc) > tegra_crtc_atomic_destroy_state(crtc, crtc->state); > > __drm_atomic_helper_crtc_reset(crtc, &state->base); > - drm_crtc_vblank_reset(crtc); > } > > static struct drm_crtc_state * > diff --git a/drivers/gpu/drm/tidss/tidss_crtc.c b/drivers/gpu/drm/tidss/tidss_crtc.c > index 89a226912de8..4d01c4af61cd 100644 > --- a/drivers/gpu/drm/tidss/tidss_crtc.c > +++ b/drivers/gpu/drm/tidss/tidss_crtc.c > @@ -352,8 +352,7 @@ static void tidss_crtc_reset(struct drm_crtc *crtc) > return; > } > > - crtc->state = &tcrtc->base; > - crtc->state->crtc = crtc; > + __drm_atomic_helper_crtc_reset(crtc, &tcrtc->base); > } > > static struct drm_crtc_state *tidss_crtc_duplicate_state(struct drm_crtc *crtc) > diff --git a/drivers/gpu/drm/tidss/tidss_kms.c b/drivers/gpu/drm/tidss/tidss_kms.c > index 4b99e9fa84a5..e6ab59eed259 100644 > --- a/drivers/gpu/drm/tidss/tidss_kms.c > +++ b/drivers/gpu/drm/tidss/tidss_kms.c > @@ -278,10 +278,6 @@ int tidss_modeset_init(struct tidss_device *tidss) > if (ret) > return ret; > > - /* Start with vertical blanking interrupt reporting disabled. */ > - for (i = 0; i < tidss->num_crtcs; ++i) > - drm_crtc_vblank_reset(tidss->crtcs[i]); > - > drm_mode_config_reset(ddev); > > dev_dbg(tidss->dev, "%s done\n", __func__);
On Thu, Jul 2, 2020 at 1:27 PM Laurent Pinchart <laurent.pinchart@ideasonboard.com> wrote: > > Hi Daniel, > > Thank you for the patch. > > On Fri, Jun 12, 2020 at 06:00:49PM +0200, Daniel Vetter wrote: > > Only when vblanks are supported ofc. > > > > Some drivers do this already, but most unfortunately missed it. This > > opens up bugs after driver load, before the crtc is enabled for the > > first time. syzbot spotted this when loading vkms as a secondary > > output. Given how many drivers are buggy it's best to solve this once > > and for all in shared helper code. > > > > Aside from moving the few existing calls to drm_crtc_vblank_reset into > > helpers (i915 doesn't use helpers, so keeps its own) I think the > > regression risk is minimal: atomic helpers already rely on drivers > > calling drm_crtc_vblank_on/off correctly in their hooks when they > > support vblanks. And driver that's failing to handle vblanks after > > this is missing those calls already, and vblanks could only work by > > accident when enabling a CRTC for the first time right after boot. > > > > Big thanks to Tetsuo for helping track down what's going wrong here. > > > > There's only a few drivers which already had the necessary call and > > needed some updating: > > - komeda, atmel and tidss also needed to be changed to call > > __drm_atomic_helper_crtc_reset() intead of open coding it > > - tegra and msm even had it in the same place already, just code > > motion, and malidp already uses __drm_atomic_helper_crtc_reset(). > > Should you mention rcar-du and omapdrm here ? Uh yes need to mention them too here, and how exactly they're a bit different. Will shuffle that from the v4: block below when applying. > > Only call left is in i915, which doesn't use drm_mode_config_reset, > > but has its own fastboot infrastructure. So that's the only case where > > we actually want this in the driver still. > > > > I've also reviewed all other drivers which set up vblank support with > > drm_vblank_init. After the previous patch fixing mxsfb all atomic > > drivers do call drm_crtc_vblank_on/off as they should, the remaining > > drivers are either legacy kms or legacy dri1 drivers, so not affected > > by this change to atomic helpers. > > > > v2: Use the drm_dev_has_vblank() helper. > > > > v3: Laurent pointed out that omap and rcar-du used drm_crtc_vblank_off > > instead of drm_crtc_vblank_reset. Adjust them too. > > > > v4: Laurent noticed that rcar-du and omap open-code their crtc reset > > and hence would actually be broken by this patch now. So fix them up > > by reusing the helpers, which brings the drm_crtc_vblank_reset() back. > > > > Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> > > Acked-by: Liviu Dudau <liviu.dudau@arm.com> > > Acked-by: Thierry Reding <treding@nvidia.com> > > Link: https://syzkaller.appspot.com/bug?id=0ba17d70d062b2595e1f061231474800f076c7cb > > Reported-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> > > Reported-by: syzbot+0871b14ca2e2fb64f6e3@syzkaller.appspotmail.com > > Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> > > Cc: "James (Qian) Wang" <james.qian.wang@arm.com> > > Cc: Liviu Dudau <liviu.dudau@arm.com> > > Cc: Mihail Atanassov <mihail.atanassov@arm.com> > > Cc: Brian Starkey <brian.starkey@arm.com> > > Cc: Sam Ravnborg <sam@ravnborg.org> > > Cc: Boris Brezillon <bbrezillon@kernel.org> > > Cc: Nicolas Ferre <nicolas.ferre@microchip.com> > > Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> > > Cc: Ludovic Desroches <ludovic.desroches@microchip.com> > > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > > Cc: Maxime Ripard <mripard@kernel.org> > > Cc: Thomas Zimmermann <tzimmermann@suse.de> > > Cc: David Airlie <airlied@linux.ie> > > Cc: Daniel Vetter <daniel@ffwll.ch> > > Cc: Thierry Reding <thierry.reding@gmail.com> > > Cc: Jonathan Hunter <jonathanh@nvidia.com> > > Cc: Jyri Sarha <jsarha@ti.com> > > Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> > > Cc: Rob Clark <robdclark@gmail.com> > > Cc: Sean Paul <seanpaul@chromium.org> > > Cc: Brian Masney <masneyb@onstation.org> > > Cc: Emil Velikov <emil.velikov@collabora.com> > > Cc: zhengbin <zhengbin13@huawei.com> > > Cc: Thomas Gleixner <tglx@linutronix.de> > > Cc: linux-tegra@vger.kernel.org > > Cc: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> > > Cc: linux-arm-kernel@lists.infradead.org > > Cc: linux-renesas-soc@vger.kernel.org > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > > --- > > drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 7 ++----- > > drivers/gpu/drm/arm/malidp_drv.c | 1 - > > drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 7 ++----- > > drivers/gpu/drm/drm_atomic_state_helper.c | 4 ++++ > > drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 2 -- > > drivers/gpu/drm/omapdrm/omap_crtc.c | 8 +++++--- > > drivers/gpu/drm/omapdrm/omap_drv.c | 4 ---- > > drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 6 +----- > > drivers/gpu/drm/tegra/dc.c | 1 - > > drivers/gpu/drm/tidss/tidss_crtc.c | 3 +-- > > drivers/gpu/drm/tidss/tidss_kms.c | 4 ---- > > 11 files changed, 15 insertions(+), 32 deletions(-) > > > > diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c > > index 56bd938961ee..f33418d6e1a0 100644 > > --- a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c > > +++ b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c > > @@ -492,10 +492,8 @@ static void komeda_crtc_reset(struct drm_crtc *crtc) > > crtc->state = NULL; > > > > state = kzalloc(sizeof(*state), GFP_KERNEL); > > - if (state) { > > - crtc->state = &state->base; > > - crtc->state->crtc = crtc; > > - } > > + if (state) > > + __drm_atomic_helper_crtc_reset(crtc, &state->base); > > } > > > > static struct drm_crtc_state * > > @@ -616,7 +614,6 @@ static int komeda_crtc_add(struct komeda_kms_dev *kms, > > return err; > > > > drm_crtc_helper_add(crtc, &komeda_crtc_helper_funcs); > > - drm_crtc_vblank_reset(crtc); > > > > crtc->port = kcrtc->master->of_output_port; > > > > diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c > > index 6feda7cb37a6..c9e1ee84b4e8 100644 > > --- a/drivers/gpu/drm/arm/malidp_drv.c > > +++ b/drivers/gpu/drm/arm/malidp_drv.c > > @@ -861,7 +861,6 @@ static int malidp_bind(struct device *dev) > > drm->irq_enabled = true; > > > > ret = drm_vblank_init(drm, drm->mode_config.num_crtc); > > - drm_crtc_vblank_reset(&malidp->crtc); > > if (ret < 0) { > > DRM_ERROR("failed to initialise vblank\n"); > > goto vblank_fail; > > diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c > > index 10985134ce0b..ce246b96330b 100644 > > --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c > > +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c > > @@ -411,10 +411,8 @@ static void atmel_hlcdc_crtc_reset(struct drm_crtc *crtc) > > } > > > > state = kzalloc(sizeof(*state), GFP_KERNEL); > > - if (state) { > > - crtc->state = &state->base; > > - crtc->state->crtc = crtc; > > - } > > + if (state) > > + __drm_atomic_helper_crtc_reset(crtc, &state->base); > > } > > > > static struct drm_crtc_state * > > @@ -528,7 +526,6 @@ int atmel_hlcdc_crtc_create(struct drm_device *dev) > > } > > > > drm_crtc_helper_add(&crtc->base, &lcdc_crtc_helper_funcs); > > - drm_crtc_vblank_reset(&crtc->base); > > > > drm_mode_crtc_set_gamma_size(&crtc->base, ATMEL_HLCDC_CLUT_SIZE); > > drm_crtc_enable_color_mgmt(&crtc->base, 0, false, > > diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/drm_atomic_state_helper.c > > index 8fce6a115dfe..9ad74045158e 100644 > > --- a/drivers/gpu/drm/drm_atomic_state_helper.c > > +++ b/drivers/gpu/drm/drm_atomic_state_helper.c > > @@ -32,6 +32,7 @@ > > #include <drm/drm_device.h> > > #include <drm/drm_plane.h> > > #include <drm/drm_print.h> > > +#include <drm/drm_vblank.h> > > #include <drm/drm_writeback.h> > > > > #include <linux/slab.h> > > @@ -93,6 +94,9 @@ __drm_atomic_helper_crtc_reset(struct drm_crtc *crtc, > > if (crtc_state) > > __drm_atomic_helper_crtc_state_reset(crtc_state, crtc); > > > > + if (drm_dev_has_vblank(crtc->dev)) > > + drm_crtc_vblank_reset(crtc); > > + > > crtc->state = crtc_state; > > } > > EXPORT_SYMBOL(__drm_atomic_helper_crtc_reset); > > diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c > > index e152016a6a7d..c39dad151bb6 100644 > > --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c > > +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c > > @@ -1117,8 +1117,6 @@ static void mdp5_crtc_reset(struct drm_crtc *crtc) > > mdp5_crtc_destroy_state(crtc, crtc->state); > > > > __drm_atomic_helper_crtc_reset(crtc, &mdp5_cstate->base); > > - > > - drm_crtc_vblank_reset(crtc); > > } > > > > static const struct drm_crtc_funcs mdp5_crtc_funcs = { > > diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c > > index fce7e944a280..6d40914675da 100644 > > --- a/drivers/gpu/drm/omapdrm/omap_crtc.c > > +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c > > @@ -697,14 +697,16 @@ static int omap_crtc_atomic_get_property(struct drm_crtc *crtc, > > > > static void omap_crtc_reset(struct drm_crtc *crtc) > > { > > + struct omap_crtc_state *state; > > + > > if (crtc->state) > > __drm_atomic_helper_crtc_destroy_state(crtc->state); > > > > kfree(crtc->state); > > - crtc->state = kzalloc(sizeof(struct omap_crtc_state), GFP_KERNEL); > > > > - if (crtc->state) > > - crtc->state->crtc = crtc; > > + state = kzalloc(sizeof(*state), GFP_KERNEL); > > + if (state) > > + __drm_atomic_helper_crtc_reset(crtc, &state->base); > > } > > > > static struct drm_crtc_state * > > diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c > > index 242d28281784..4526967978b7 100644 > > --- a/drivers/gpu/drm/omapdrm/omap_drv.c > > +++ b/drivers/gpu/drm/omapdrm/omap_drv.c > > @@ -595,7 +595,6 @@ static int omapdrm_init(struct omap_drm_private *priv, struct device *dev) > > { > > const struct soc_device_attribute *soc; > > struct drm_device *ddev; > > - unsigned int i; > > int ret; > > > > DBG("%s", dev_name(dev)); > > @@ -642,9 +641,6 @@ static int omapdrm_init(struct omap_drm_private *priv, struct device *dev) > > goto err_cleanup_modeset; > > } > > > > - for (i = 0; i < priv->num_pipes; i++) > > - drm_crtc_vblank_off(priv->pipes[i].crtc); > > - > > omap_fbdev_init(ddev); > > > > drm_kms_helper_poll_init(ddev); > > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c > > index d73e88ddecd0..fe86a3e67757 100644 > > --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c > > +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c > > @@ -975,8 +975,7 @@ static void rcar_du_crtc_reset(struct drm_crtc *crtc) > > state->crc.source = VSP1_DU_CRC_NONE; > > state->crc.index = 0; > > > > - crtc->state = &state->state; > > - crtc->state->crtc = crtc; > > + __drm_atomic_helper_crtc_reset(crtc, &state->state); > > } > > > > static int rcar_du_crtc_enable_vblank(struct drm_crtc *crtc) > > @@ -1271,9 +1270,6 @@ int rcar_du_crtc_create(struct rcar_du_group *rgrp, unsigned int swindex, > > > > drm_crtc_helper_add(crtc, &crtc_helper_funcs); > > > > - /* Start with vertical blanking interrupt reporting disabled. */ > > - drm_crtc_vblank_off(crtc); > > - > > Could this cause an issue, as the interrupt handler can now be > registered with the interrupt left enabled in the hardware after a > reboot, while drm_crtc_vblank_off() would disable it ? It's something > that should likely be handled elsewhere in the driver, with all > interrupts disabled explicitly early in probe, and I don't think the > driver handles enabled interrupts very well today, so it's not a blocker > for me: Atomic helpers, specifically the reset helpers I'm adjusting here assume that at driver load time everything is completely off. They _only_ reset the sw state. If you want to have more smooth takeover (flicker-free boot eventually even), or have some hw that's not getting reset as part of power-up or driver load, then that would be for the driver to handle. I think we recently had a discussion about what would need to be added to make atomic helpers support take-over of actual hw state at driver load. And yes if that's the case, then you'd need a different flow here to make sure vblank state is matching crtc state (e.g. i915 does that). Wrt this case here specifically drm_handle_vblank needs to handle races anyway, so it's robust against being called when the vblanks are disabled in software. So I don't think you'll have any serious problem here. Actual hw irq enable/disable is only done around drm_vblank_get/put (well with some delay), so I don't think that would have changed anything for you wrt actually getting an interrupt or not. So tldr; I think just drm_vblank_reset here fits the best with overall helpers we have. > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > I would however appreciate your thoughts on this topic, to know if my > understanding is correct (and if this issue could affect other drivers). Thanks a lot for your review, I'll apply the entire bunch later today. -Daniel > > > /* Register the interrupt handler. */ > > if (rcar_du_has(rcdu, RCAR_DU_FEATURE_CRTC_IRQ_CLOCK)) { > > /* The IRQ's are associated with the CRTC (sw)index. */ > > diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c > > index 83f31c6e891c..9b308b572eac 100644 > > --- a/drivers/gpu/drm/tegra/dc.c > > +++ b/drivers/gpu/drm/tegra/dc.c > > @@ -1168,7 +1168,6 @@ static void tegra_crtc_reset(struct drm_crtc *crtc) > > tegra_crtc_atomic_destroy_state(crtc, crtc->state); > > > > __drm_atomic_helper_crtc_reset(crtc, &state->base); > > - drm_crtc_vblank_reset(crtc); > > } > > > > static struct drm_crtc_state * > > diff --git a/drivers/gpu/drm/tidss/tidss_crtc.c b/drivers/gpu/drm/tidss/tidss_crtc.c > > index 89a226912de8..4d01c4af61cd 100644 > > --- a/drivers/gpu/drm/tidss/tidss_crtc.c > > +++ b/drivers/gpu/drm/tidss/tidss_crtc.c > > @@ -352,8 +352,7 @@ static void tidss_crtc_reset(struct drm_crtc *crtc) > > return; > > } > > > > - crtc->state = &tcrtc->base; > > - crtc->state->crtc = crtc; > > + __drm_atomic_helper_crtc_reset(crtc, &tcrtc->base); > > } > > > > static struct drm_crtc_state *tidss_crtc_duplicate_state(struct drm_crtc *crtc) > > diff --git a/drivers/gpu/drm/tidss/tidss_kms.c b/drivers/gpu/drm/tidss/tidss_kms.c > > index 4b99e9fa84a5..e6ab59eed259 100644 > > --- a/drivers/gpu/drm/tidss/tidss_kms.c > > +++ b/drivers/gpu/drm/tidss/tidss_kms.c > > @@ -278,10 +278,6 @@ int tidss_modeset_init(struct tidss_device *tidss) > > if (ret) > > return ret; > > > > - /* Start with vertical blanking interrupt reporting disabled. */ > > - for (i = 0; i < tidss->num_crtcs; ++i) > > - drm_crtc_vblank_reset(tidss->crtcs[i]); > > - > > drm_mode_config_reset(ddev); > > > > dev_dbg(tidss->dev, "%s done\n", __func__); > > -- > Regards, > > Laurent Pinchart
As of commit 47ec5303d73ea344 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next") on linux.git ,
my VMware environment cannot boot. Do I need to bisect?
[ 9.314496][ T1] vga16fb: mapped to 0x0000000071050562
[ 9.467770][ T1] Console: switching to colour frame buffer device 80x30
[ 9.632092][ T1] fb0: VGA16 VGA frame buffer device
[ 9.651768][ T1] ACPI: AC Adapter [ACAD] (on-line)
[ 9.672544][ T1] input: Power Button as /devices/LNXSYSTM:00/LNXPWRBN:00/input/input0
[ 9.722373][ T1] ACPI: Power Button [PWRF]
[ 9.744231][ T1] ioatdma: Intel(R) QuickData Technology Driver 5.00
[ 9.820147][ T1] N_HDLC line discipline registered with maxframe=4096
[ 9.835649][ T1] Serial: 8250/16550 driver, 4 ports, IRQ sharing enabled
[ 9.852567][ T1] 00:05: ttyS0 at I/O 0x3f8 (irq = 4, base_baud = 115200) is a 16550A
[ 10.033372][ T1] Cyclades driver 2.6
[ 10.049928][ T1] Initializing Nozomi driver 2.1d
[ 10.065493][ T1] RocketPort device driver module, version 2.09, 12-June-2003
[ 10.095368][ T1] No rocketport ports found; unloading driver
[ 10.112430][ T1] Non-volatile memory driver v1.3
[ 10.127090][ T1] Linux agpgart interface v0.103
[ 10.144037][ T1] agpgart-intel 0000:00:00.0: Intel 440BX Chipset
[ 10.162275][ T1] agpgart-intel 0000:00:00.0: AGP aperture is 256M @ 0x0
[ 10.181130][ T1] [drm] DMA map mode: Caching DMA mappings.
[ 10.195150][ T1] [drm] Capabilities:
[ 10.208728][ T1] [drm] Rect copy.
[ 10.222772][ T1] [drm] Cursor.
[ 10.235364][ T1] [drm] Cursor bypass.
[ 10.249121][ T1] [drm] Cursor bypass 2.
[ 10.260590][ T1] [drm] 8bit emulation.
[ 10.272220][ T1] [drm] Alpha cursor.
[ 10.284670][ T1] [drm] 3D.
[ 10.295051][ T1] [drm] Extended Fifo.
[ 10.305180][ T1] [drm] Multimon.
[ 10.315506][ T1] [drm] Pitchlock.
[ 10.325167][ T1] [drm] Irq mask.
[ 10.334262][ T1] [drm] Display Topology.
[ 10.343519][ T1] [drm] GMR.
[ 10.352775][ T1] [drm] Traces.
[ 10.362166][ T1] [drm] GMR2.
[ 10.370716][ T1] [drm] Screen Object 2.
[ 10.379220][ T1] [drm] Command Buffers.
[ 10.388489][ T1] [drm] Command Buffers 2.
[ 10.396055][ T1] [drm] Guest Backed Resources.
[ 10.403290][ T1] [drm] DX Features.
[ 10.409911][ T1] [drm] HP Command Queue.
[ 10.417820][ T1] [drm] Capabilities2:
[ 10.424216][ T1] [drm] Grow oTable.
[ 10.430423][ T1] [drm] IntraSurface copy.
[ 10.436371][ T1] [drm] Max GMR ids is 64
[ 10.442651][ T1] [drm] Max number of GMR pages is 65536
[ 10.450317][ T1] [drm] Max dedicated hypervisor surface memory is 0 kiB
[ 10.458809][ T1] [drm] Maximum display memory size is 262144 kiB
[ 10.466330][ T1] [drm] VRAM at 0xe8000000 size is 4096 kiB
[ 10.474704][ T1] [drm] MMIO at 0xfe000000 size is 256 kiB
[ 10.484625][ T1] [TTM] Zone kernel: Available graphics memory: 4030538 KiB
[ 10.500730][ T1] [TTM] Zone dma32: Available graphics memory: 2097152 KiB
[ 10.516851][ T1] [TTM] Initializing pool allocator
[ 10.527542][ T1] [TTM] Initializing DMA pool allocator
[ 10.540197][ T1] BUG: kernel NULL pointer dereference, address: 0000000000000438
[ 10.550087][ T1] #PF: supervisor read access in kernel mode
[ 10.550087][ T1] #PF: error_code(0x0000) - not-present page
[ 10.550087][ T1] PGD 0 P4D 0
[ 10.550087][ T1] Oops: 0000 [#1] PREEMPT SMP
[ 10.550087][ T1] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.8.0+ #271
[ 10.550087][ T1] Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 02/27/2020
[ 10.550087][ T1] RIP: 0010:drm_dev_has_vblank+0x9/0x20
[ 10.550087][ T1] Code: 5d 41 5e 41 5f e9 e7 fa 01 ff e8 e2 fa 01 ff 45 31 e4 41 8b 5f 48 eb a7 cc cc cc cc cc cc cc cc cc 53 48 89 fb e8 c7 fa 01 ff <8b> 83 38 04 00 00 5b 85 c0 0f 95 c0 c3 66 2e 0f 1f 84 00 00 00 00
[ 10.550087][ T1] RSP: 0000:ffffc90000027b80 EFLAGS: 00010293
[ 10.550087][ T1] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000
[ 10.550087][ T1] RDX: ffff88823544c040 RSI: ffffffff823265b9 RDI: 0000000000000000
[ 10.550087][ T1] RBP: ffff888227238800 R08: 0000000000000001 R09: 0000000000000000
[ 10.550087][ T1] R10: ffff888227238800 R11: 0000000000000001 R12: 0000000000000000
[ 10.550087][ T1] R13: ffff888235103000 R14: 0000000000000000 R15: ffff888226cc6af0
[ 10.850690][ T1] FS: 0000000000000000(0000) GS:ffff888236e00000(0000) knlGS:0000000000000000
[ 10.850690][ T1] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 10.850690][ T1] CR2: 0000000000000438 CR3: 0000000004a89001 CR4: 00000000003706f0
[ 10.850690][ T1] Call Trace:
[ 10.850690][ T1] __drm_atomic_helper_crtc_reset+0x28/0x50
[ 10.850690][ T1] vmw_du_crtc_reset+0x62/0x80
[ 10.850690][ T1] vmw_kms_stdu_init_display+0x302/0x3f0
[ 10.850690][ T1] vmw_kms_init+0x6f/0xe0
[ 10.850690][ T1] vmw_probe+0xd52/0x1730
[ 10.850690][ T1] local_pci_probe+0x3a/0x90
[ 10.850690][ T1] pci_device_probe+0x163/0x230
[ 10.850690][ T1] ? pci_device_remove+0x100/0x100
[ 10.850690][ T1] really_probe+0x228/0x480
[ 10.850690][ T1] ? rdinit_setup+0x3b/0x3b
[ 10.850690][ T1] driver_probe_device+0x6c/0xe0
[ 10.850690][ T1] device_driver_attach+0x5a/0x60
[ 10.850690][ T1] __driver_attach+0xbd/0x100
[ 10.850690][ T1] ? device_driver_attach+0x60/0x60
[ 10.850690][ T1] bus_for_each_dev+0x9e/0x110
[ 10.850690][ T1] bus_add_driver+0x1c8/0x260
[ 10.850690][ T1] driver_register+0x96/0x160
[ 10.850690][ T1] ? i915_global_vma_init+0x51/0x51
[ 11.202435][ T1] vmwgfx_init+0x2e/0x4e
[ 11.202435][ T1] do_one_initcall+0x84/0x4a0
[ 11.202435][ T1] ? rdinit_setup+0x3b/0x3b
[ 11.202435][ T1] ? rcu_read_lock_sched_held+0x4d/0x80
[ 11.202435][ T1] ? cpumask_test_cpu.constprop.19+0x12/0x30
[ 11.202435][ T1] ? rdinit_setup+0x3b/0x3b
[ 11.202435][ T1] kernel_init_freeable+0x298/0x30c
[ 11.202435][ T1] ? rest_init+0x2c0/0x2c0
[ 11.202435][ T1] kernel_init+0xf/0x170
[ 11.282173][ T1] ? _raw_spin_unlock_irq+0x3a/0x50
[ 11.282173][ T1] ? rest_init+0x2c0/0x2c0
[ 11.282173][ T1] ret_from_fork+0x1f/0x30
[ 11.282173][ T1] Modules linked in:
[ 11.282173][ T1] CR2: 0000000000000438
[ 11.282173][ T1] ---[ end trace fb560758d9d704d3 ]---
[ 11.282173][ T1] RIP: 0010:drm_dev_has_vblank+0x9/0x20
[ 11.282173][ T1] Code: 5d 41 5e 41 5f e9 e7 fa 01 ff e8 e2 fa 01 ff 45 31 e4 41 8b 5f 48 eb a7 cc cc cc cc cc cc cc cc cc 53 48 89 fb e8 c7 fa 01 ff <8b> 83 38 04 00 00 5b 85 c0 0f 95 c0 c3 66 2e 0f 1f 84 00 00 00 00
[ 11.282173][ T1] RSP: 0000:ffffc90000027b80 EFLAGS: 00010293
[ 11.282173][ T1] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000
[ 11.282173][ T1] RDX: ffff88823544c040 RSI: ffffffff823265b9 RDI: 0000000000000000
[ 11.282173][ T1] RBP: ffff888227238800 R08: 0000000000000001 R09: 0000000000000000
[ 11.282173][ T1] R10: ffff888227238800 R11: 0000000000000001 R12: 0000000000000000
[ 11.282173][ T1] R13: ffff888235103000 R14: 0000000000000000 R15: ffff888226cc6af0
[ 11.282173][ T1] FS: 0000000000000000(0000) GS:ffff888236e00000(0000) knlGS:0000000000000000
[ 11.282173][ T1] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 11.282173][ T1] CR2: 0000000000000438 CR3: 0000000004a89001 CR4: 00000000003706f0
[ 11.282173][ T1] Kernel panic - not syncing: Fatal exception
[ 11.282173][ T1] Kernel Offset: disabled
[ 11.282173][ T1] Rebooting in 86400 seconds..
On Thu, Aug 06, 2020 at 03:43:02PM +0900, Tetsuo Handa wrote: > As of commit 47ec5303d73ea344 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next") on linux.git , > my VMware environment cannot boot. Do I need to bisect? That sounds like a good idea, but please start a new thread (not reply to some random existing ones), with maintainers for drivers/gpu/drm/vmwgfx only. Not a massive list of random folks who have no idea what's going on here. From get_maintainers.pl $ scripts/get_maintainer.pl -f drivers/gpu/drm/vmwgfx/ VMware Graphics <linux-graphics-maintainer@vmware.com> (supporter:DRM DRIVER FOR VMWARE VIRTUAL GPU) Roland Scheidegger <sroland@vmware.com> (supporter:DRM DRIVER FOR VMWARE VIRTUAL GPU) David Airlie <airlied@linux.ie> (maintainer:DRM DRIVERS) Daniel Vetter <daniel@ffwll.ch> (maintainer:DRM DRIVERS) dri-devel@lists.freedesktop.org (open list:DRM DRIVER FOR VMWARE VIRTUAL GPU) linux-kernel@vger.kernel.org (open list) Cheers, Daniel > > [ 9.314496][ T1] vga16fb: mapped to 0x0000000071050562 > [ 9.467770][ T1] Console: switching to colour frame buffer device 80x30 > [ 9.632092][ T1] fb0: VGA16 VGA frame buffer device > [ 9.651768][ T1] ACPI: AC Adapter [ACAD] (on-line) > [ 9.672544][ T1] input: Power Button as /devices/LNXSYSTM:00/LNXPWRBN:00/input/input0 > [ 9.722373][ T1] ACPI: Power Button [PWRF] > [ 9.744231][ T1] ioatdma: Intel(R) QuickData Technology Driver 5.00 > [ 9.820147][ T1] N_HDLC line discipline registered with maxframe=4096 > [ 9.835649][ T1] Serial: 8250/16550 driver, 4 ports, IRQ sharing enabled > [ 9.852567][ T1] 00:05: ttyS0 at I/O 0x3f8 (irq = 4, base_baud = 115200) is a 16550A > [ 10.033372][ T1] Cyclades driver 2.6 > [ 10.049928][ T1] Initializing Nozomi driver 2.1d > [ 10.065493][ T1] RocketPort device driver module, version 2.09, 12-June-2003 > [ 10.095368][ T1] No rocketport ports found; unloading driver > [ 10.112430][ T1] Non-volatile memory driver v1.3 > [ 10.127090][ T1] Linux agpgart interface v0.103 > [ 10.144037][ T1] agpgart-intel 0000:00:00.0: Intel 440BX Chipset > [ 10.162275][ T1] agpgart-intel 0000:00:00.0: AGP aperture is 256M @ 0x0 > [ 10.181130][ T1] [drm] DMA map mode: Caching DMA mappings. > [ 10.195150][ T1] [drm] Capabilities: > [ 10.208728][ T1] [drm] Rect copy. > [ 10.222772][ T1] [drm] Cursor. > [ 10.235364][ T1] [drm] Cursor bypass. > [ 10.249121][ T1] [drm] Cursor bypass 2. > [ 10.260590][ T1] [drm] 8bit emulation. > [ 10.272220][ T1] [drm] Alpha cursor. > [ 10.284670][ T1] [drm] 3D. > [ 10.295051][ T1] [drm] Extended Fifo. > [ 10.305180][ T1] [drm] Multimon. > [ 10.315506][ T1] [drm] Pitchlock. > [ 10.325167][ T1] [drm] Irq mask. > [ 10.334262][ T1] [drm] Display Topology. > [ 10.343519][ T1] [drm] GMR. > [ 10.352775][ T1] [drm] Traces. > [ 10.362166][ T1] [drm] GMR2. > [ 10.370716][ T1] [drm] Screen Object 2. > [ 10.379220][ T1] [drm] Command Buffers. > [ 10.388489][ T1] [drm] Command Buffers 2. > [ 10.396055][ T1] [drm] Guest Backed Resources. > [ 10.403290][ T1] [drm] DX Features. > [ 10.409911][ T1] [drm] HP Command Queue. > [ 10.417820][ T1] [drm] Capabilities2: > [ 10.424216][ T1] [drm] Grow oTable. > [ 10.430423][ T1] [drm] IntraSurface copy. > [ 10.436371][ T1] [drm] Max GMR ids is 64 > [ 10.442651][ T1] [drm] Max number of GMR pages is 65536 > [ 10.450317][ T1] [drm] Max dedicated hypervisor surface memory is 0 kiB > [ 10.458809][ T1] [drm] Maximum display memory size is 262144 kiB > [ 10.466330][ T1] [drm] VRAM at 0xe8000000 size is 4096 kiB > [ 10.474704][ T1] [drm] MMIO at 0xfe000000 size is 256 kiB > [ 10.484625][ T1] [TTM] Zone kernel: Available graphics memory: 4030538 KiB > [ 10.500730][ T1] [TTM] Zone dma32: Available graphics memory: 2097152 KiB > [ 10.516851][ T1] [TTM] Initializing pool allocator > [ 10.527542][ T1] [TTM] Initializing DMA pool allocator > [ 10.540197][ T1] BUG: kernel NULL pointer dereference, address: 0000000000000438 > [ 10.550087][ T1] #PF: supervisor read access in kernel mode > [ 10.550087][ T1] #PF: error_code(0x0000) - not-present page > [ 10.550087][ T1] PGD 0 P4D 0 > [ 10.550087][ T1] Oops: 0000 [#1] PREEMPT SMP > [ 10.550087][ T1] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.8.0+ #271 > [ 10.550087][ T1] Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 02/27/2020 > [ 10.550087][ T1] RIP: 0010:drm_dev_has_vblank+0x9/0x20 > [ 10.550087][ T1] Code: 5d 41 5e 41 5f e9 e7 fa 01 ff e8 e2 fa 01 ff 45 31 e4 41 8b 5f 48 eb a7 cc cc cc cc cc cc cc cc cc 53 48 89 fb e8 c7 fa 01 ff <8b> 83 38 04 00 00 5b 85 c0 0f 95 c0 c3 66 2e 0f 1f 84 00 00 00 00 > [ 10.550087][ T1] RSP: 0000:ffffc90000027b80 EFLAGS: 00010293 > [ 10.550087][ T1] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000 > [ 10.550087][ T1] RDX: ffff88823544c040 RSI: ffffffff823265b9 RDI: 0000000000000000 > [ 10.550087][ T1] RBP: ffff888227238800 R08: 0000000000000001 R09: 0000000000000000 > [ 10.550087][ T1] R10: ffff888227238800 R11: 0000000000000001 R12: 0000000000000000 > [ 10.550087][ T1] R13: ffff888235103000 R14: 0000000000000000 R15: ffff888226cc6af0 > [ 10.850690][ T1] FS: 0000000000000000(0000) GS:ffff888236e00000(0000) knlGS:0000000000000000 > [ 10.850690][ T1] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > [ 10.850690][ T1] CR2: 0000000000000438 CR3: 0000000004a89001 CR4: 00000000003706f0 > [ 10.850690][ T1] Call Trace: > [ 10.850690][ T1] __drm_atomic_helper_crtc_reset+0x28/0x50 > [ 10.850690][ T1] vmw_du_crtc_reset+0x62/0x80 > [ 10.850690][ T1] vmw_kms_stdu_init_display+0x302/0x3f0 > [ 10.850690][ T1] vmw_kms_init+0x6f/0xe0 > [ 10.850690][ T1] vmw_probe+0xd52/0x1730 > [ 10.850690][ T1] local_pci_probe+0x3a/0x90 > [ 10.850690][ T1] pci_device_probe+0x163/0x230 > [ 10.850690][ T1] ? pci_device_remove+0x100/0x100 > [ 10.850690][ T1] really_probe+0x228/0x480 > [ 10.850690][ T1] ? rdinit_setup+0x3b/0x3b > [ 10.850690][ T1] driver_probe_device+0x6c/0xe0 > [ 10.850690][ T1] device_driver_attach+0x5a/0x60 > [ 10.850690][ T1] __driver_attach+0xbd/0x100 > [ 10.850690][ T1] ? device_driver_attach+0x60/0x60 > [ 10.850690][ T1] bus_for_each_dev+0x9e/0x110 > [ 10.850690][ T1] bus_add_driver+0x1c8/0x260 > [ 10.850690][ T1] driver_register+0x96/0x160 > [ 10.850690][ T1] ? i915_global_vma_init+0x51/0x51 > [ 11.202435][ T1] vmwgfx_init+0x2e/0x4e > [ 11.202435][ T1] do_one_initcall+0x84/0x4a0 > [ 11.202435][ T1] ? rdinit_setup+0x3b/0x3b > [ 11.202435][ T1] ? rcu_read_lock_sched_held+0x4d/0x80 > [ 11.202435][ T1] ? cpumask_test_cpu.constprop.19+0x12/0x30 > [ 11.202435][ T1] ? rdinit_setup+0x3b/0x3b > [ 11.202435][ T1] kernel_init_freeable+0x298/0x30c > [ 11.202435][ T1] ? rest_init+0x2c0/0x2c0 > [ 11.202435][ T1] kernel_init+0xf/0x170 > [ 11.282173][ T1] ? _raw_spin_unlock_irq+0x3a/0x50 > [ 11.282173][ T1] ? rest_init+0x2c0/0x2c0 > [ 11.282173][ T1] ret_from_fork+0x1f/0x30 > [ 11.282173][ T1] Modules linked in: > [ 11.282173][ T1] CR2: 0000000000000438 > [ 11.282173][ T1] ---[ end trace fb560758d9d704d3 ]--- > [ 11.282173][ T1] RIP: 0010:drm_dev_has_vblank+0x9/0x20 > [ 11.282173][ T1] Code: 5d 41 5e 41 5f e9 e7 fa 01 ff e8 e2 fa 01 ff 45 31 e4 41 8b 5f 48 eb a7 cc cc cc cc cc cc cc cc cc 53 48 89 fb e8 c7 fa 01 ff <8b> 83 38 04 00 00 5b 85 c0 0f 95 c0 c3 66 2e 0f 1f 84 00 00 00 00 > [ 11.282173][ T1] RSP: 0000:ffffc90000027b80 EFLAGS: 00010293 > [ 11.282173][ T1] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000 > [ 11.282173][ T1] RDX: ffff88823544c040 RSI: ffffffff823265b9 RDI: 0000000000000000 > [ 11.282173][ T1] RBP: ffff888227238800 R08: 0000000000000001 R09: 0000000000000000 > [ 11.282173][ T1] R10: ffff888227238800 R11: 0000000000000001 R12: 0000000000000000 > [ 11.282173][ T1] R13: ffff888235103000 R14: 0000000000000000 R15: ffff888226cc6af0 > [ 11.282173][ T1] FS: 0000000000000000(0000) GS:ffff888236e00000(0000) knlGS:0000000000000000 > [ 11.282173][ T1] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > [ 11.282173][ T1] CR2: 0000000000000438 CR3: 0000000004a89001 CR4: 00000000003706f0 > [ 11.282173][ T1] Kernel panic - not syncing: Fatal exception > [ 11.282173][ T1] Kernel Offset: disabled > [ 11.282173][ T1] Rebooting in 86400 seconds.. > >
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c index 56bd938961ee..f33418d6e1a0 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c @@ -492,10 +492,8 @@ static void komeda_crtc_reset(struct drm_crtc *crtc) crtc->state = NULL; state = kzalloc(sizeof(*state), GFP_KERNEL); - if (state) { - crtc->state = &state->base; - crtc->state->crtc = crtc; - } + if (state) + __drm_atomic_helper_crtc_reset(crtc, &state->base); } static struct drm_crtc_state * @@ -616,7 +614,6 @@ static int komeda_crtc_add(struct komeda_kms_dev *kms, return err; drm_crtc_helper_add(crtc, &komeda_crtc_helper_funcs); - drm_crtc_vblank_reset(crtc); crtc->port = kcrtc->master->of_output_port; diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c index 6feda7cb37a6..c9e1ee84b4e8 100644 --- a/drivers/gpu/drm/arm/malidp_drv.c +++ b/drivers/gpu/drm/arm/malidp_drv.c @@ -861,7 +861,6 @@ static int malidp_bind(struct device *dev) drm->irq_enabled = true; ret = drm_vblank_init(drm, drm->mode_config.num_crtc); - drm_crtc_vblank_reset(&malidp->crtc); if (ret < 0) { DRM_ERROR("failed to initialise vblank\n"); goto vblank_fail; diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c index 10985134ce0b..ce246b96330b 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c @@ -411,10 +411,8 @@ static void atmel_hlcdc_crtc_reset(struct drm_crtc *crtc) } state = kzalloc(sizeof(*state), GFP_KERNEL); - if (state) { - crtc->state = &state->base; - crtc->state->crtc = crtc; - } + if (state) + __drm_atomic_helper_crtc_reset(crtc, &state->base); } static struct drm_crtc_state * @@ -528,7 +526,6 @@ int atmel_hlcdc_crtc_create(struct drm_device *dev) } drm_crtc_helper_add(&crtc->base, &lcdc_crtc_helper_funcs); - drm_crtc_vblank_reset(&crtc->base); drm_mode_crtc_set_gamma_size(&crtc->base, ATMEL_HLCDC_CLUT_SIZE); drm_crtc_enable_color_mgmt(&crtc->base, 0, false, diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/drm_atomic_state_helper.c index 8fce6a115dfe..9ad74045158e 100644 --- a/drivers/gpu/drm/drm_atomic_state_helper.c +++ b/drivers/gpu/drm/drm_atomic_state_helper.c @@ -32,6 +32,7 @@ #include <drm/drm_device.h> #include <drm/drm_plane.h> #include <drm/drm_print.h> +#include <drm/drm_vblank.h> #include <drm/drm_writeback.h> #include <linux/slab.h> @@ -93,6 +94,9 @@ __drm_atomic_helper_crtc_reset(struct drm_crtc *crtc, if (crtc_state) __drm_atomic_helper_crtc_state_reset(crtc_state, crtc); + if (drm_dev_has_vblank(crtc->dev)) + drm_crtc_vblank_reset(crtc); + crtc->state = crtc_state; } EXPORT_SYMBOL(__drm_atomic_helper_crtc_reset); diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c index e152016a6a7d..c39dad151bb6 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c @@ -1117,8 +1117,6 @@ static void mdp5_crtc_reset(struct drm_crtc *crtc) mdp5_crtc_destroy_state(crtc, crtc->state); __drm_atomic_helper_crtc_reset(crtc, &mdp5_cstate->base); - - drm_crtc_vblank_reset(crtc); } static const struct drm_crtc_funcs mdp5_crtc_funcs = { diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c index fce7e944a280..6d40914675da 100644 --- a/drivers/gpu/drm/omapdrm/omap_crtc.c +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c @@ -697,14 +697,16 @@ static int omap_crtc_atomic_get_property(struct drm_crtc *crtc, static void omap_crtc_reset(struct drm_crtc *crtc) { + struct omap_crtc_state *state; + if (crtc->state) __drm_atomic_helper_crtc_destroy_state(crtc->state); kfree(crtc->state); - crtc->state = kzalloc(sizeof(struct omap_crtc_state), GFP_KERNEL); - if (crtc->state) - crtc->state->crtc = crtc; + state = kzalloc(sizeof(*state), GFP_KERNEL); + if (state) + __drm_atomic_helper_crtc_reset(crtc, &state->base); } static struct drm_crtc_state * diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c index 242d28281784..4526967978b7 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.c +++ b/drivers/gpu/drm/omapdrm/omap_drv.c @@ -595,7 +595,6 @@ static int omapdrm_init(struct omap_drm_private *priv, struct device *dev) { const struct soc_device_attribute *soc; struct drm_device *ddev; - unsigned int i; int ret; DBG("%s", dev_name(dev)); @@ -642,9 +641,6 @@ static int omapdrm_init(struct omap_drm_private *priv, struct device *dev) goto err_cleanup_modeset; } - for (i = 0; i < priv->num_pipes; i++) - drm_crtc_vblank_off(priv->pipes[i].crtc); - omap_fbdev_init(ddev); drm_kms_helper_poll_init(ddev); diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c index d73e88ddecd0..fe86a3e67757 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c @@ -975,8 +975,7 @@ static void rcar_du_crtc_reset(struct drm_crtc *crtc) state->crc.source = VSP1_DU_CRC_NONE; state->crc.index = 0; - crtc->state = &state->state; - crtc->state->crtc = crtc; + __drm_atomic_helper_crtc_reset(crtc, &state->state); } static int rcar_du_crtc_enable_vblank(struct drm_crtc *crtc) @@ -1271,9 +1270,6 @@ int rcar_du_crtc_create(struct rcar_du_group *rgrp, unsigned int swindex, drm_crtc_helper_add(crtc, &crtc_helper_funcs); - /* Start with vertical blanking interrupt reporting disabled. */ - drm_crtc_vblank_off(crtc); - /* Register the interrupt handler. */ if (rcar_du_has(rcdu, RCAR_DU_FEATURE_CRTC_IRQ_CLOCK)) { /* The IRQ's are associated with the CRTC (sw)index. */ diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c index 83f31c6e891c..9b308b572eac 100644 --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c @@ -1168,7 +1168,6 @@ static void tegra_crtc_reset(struct drm_crtc *crtc) tegra_crtc_atomic_destroy_state(crtc, crtc->state); __drm_atomic_helper_crtc_reset(crtc, &state->base); - drm_crtc_vblank_reset(crtc); } static struct drm_crtc_state * diff --git a/drivers/gpu/drm/tidss/tidss_crtc.c b/drivers/gpu/drm/tidss/tidss_crtc.c index 89a226912de8..4d01c4af61cd 100644 --- a/drivers/gpu/drm/tidss/tidss_crtc.c +++ b/drivers/gpu/drm/tidss/tidss_crtc.c @@ -352,8 +352,7 @@ static void tidss_crtc_reset(struct drm_crtc *crtc) return; } - crtc->state = &tcrtc->base; - crtc->state->crtc = crtc; + __drm_atomic_helper_crtc_reset(crtc, &tcrtc->base); } static struct drm_crtc_state *tidss_crtc_duplicate_state(struct drm_crtc *crtc) diff --git a/drivers/gpu/drm/tidss/tidss_kms.c b/drivers/gpu/drm/tidss/tidss_kms.c index 4b99e9fa84a5..e6ab59eed259 100644 --- a/drivers/gpu/drm/tidss/tidss_kms.c +++ b/drivers/gpu/drm/tidss/tidss_kms.c @@ -278,10 +278,6 @@ int tidss_modeset_init(struct tidss_device *tidss) if (ret) return ret; - /* Start with vertical blanking interrupt reporting disabled. */ - for (i = 0; i < tidss->num_crtcs; ++i) - drm_crtc_vblank_reset(tidss->crtcs[i]); - drm_mode_config_reset(ddev); dev_dbg(tidss->dev, "%s done\n", __func__);