From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> To: Daniel Vetter <daniel@ffwll.ch> Cc: Peter Wu <peter@lekensteyn.nl>, Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>, Dave Airlie <airlied@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>, Alan Jenkins <alan.christopher.jenkins@gmail.com>, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, virtualization@lists.linux-foundation.org Subject: Re: [PATCH] qxl: fix null-pointer crash during suspend Date: Tue, 02 Oct 2018 13:05:50 +0300 [thread overview] Message-ID: <1688275.zophSNHJ2k@avalon> (raw) In-Reply-To: <20181002081422.GH11082@phenom.ffwll.local> Hello, On Tuesday, 2 October 2018 11:14:22 EEST Daniel Vetter wrote: > On Tue, Sep 04, 2018 at 10:27:47PM +0200, Peter Wu wrote: > > "crtc->helper_private" is not initialized by the QXL driver and thus the > > This is still initialized, it's the ->disable that goes boom. At least the > call to drm_crtc_helper_add is still there. The ->disable was removed in: > > commit 64581714b58bc3e16ede8dc37a025c3aa0e0eef1 > Author: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > Date: Fri Jun 30 12:36:45 2017 +0300 > > drm: Convert atomic drivers from CRTC .disable() to .atomic_disable() > > Fixes: 64581714b58b ("drm: Convert atomic drivers from CRTC .disable() to > .atomic_disable()") Cc: <stable@vger.kernel.org> # v4.14+ > Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > > I'll let Gerd pick this one up, after some testing. Also adding Laurent. Sorry for breaking it :-( Please let me know if there's something I can do to help. > > "crtc_funcs->disable" call would crash (resulting in suspend failure). > > Fix this by converting the suspend/resume functions to use the > > drm_mode_config_helper_* helpers. > > > > Tested system sleep with QEMU 3.0 using "echo mem > /sys/power/state". > > > > During suspend the following message is visible from QEMU: > > spice/server/display-channel.c:2425:display_channel_validate_surface: > > canvas address is 0x7fd05da68308 for 0 (and is NULL) > > spice/server/display-channel.c:2426:display_channel_validate_surface: > > failed on 0> > > This seems to be triggered by QXL_IO_NOTIFY_CMD after > > QXL_IO_DESTROY_PRIMARY_ASYNC, but aside from the warning things still > > seem to work (tested with both the GTK and -spice options). > > > > Signed-off-by: Peter Wu <peter@lekensteyn.nl> > > --- > > Hi, > > > > I found this issue while trying to suspend a VM that uses QXL. In order to > > see the stack trace over serial, boot with no_console_suspend. Searching > > for "qxl_drm_freeze" showed one recent report from Alan: > > https://lkml.kernel.org/r/891e334c-cf19-032c-b996-59ac166fcde1@gmail.com > > > > Kind regards, > > Peter > > --- > > > > drivers/gpu/drm/qxl/qxl_drv.c | 26 +++++--------------------- > > 1 file changed, 5 insertions(+), 21 deletions(-) > > > > diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c > > index 2445e75cf7ea..d00f45eed03c 100644 > > --- a/drivers/gpu/drm/qxl/qxl_drv.c > > +++ b/drivers/gpu/drm/qxl/qxl_drv.c > > @@ -136,20 +136,11 @@ static int qxl_drm_freeze(struct drm_device *dev) > > > > { > > > > struct pci_dev *pdev = dev->pdev; > > struct qxl_device *qdev = dev->dev_private; > > > > - struct drm_crtc *crtc; > > - > > - drm_kms_helper_poll_disable(dev); > > - > > - console_lock(); > > - qxl_fbdev_set_suspend(qdev, 1); > > - console_unlock(); > > + int ret; > > > > - /* unpin the front buffers */ > > - list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { > > - const struct drm_crtc_helper_funcs *crtc_funcs = crtc- >helper_private; > > - if (crtc->enabled) > > - (*crtc_funcs->disable)(crtc); > > - } > > + ret = drm_mode_config_helper_suspend(dev); > > + if (ret) > > + return ret; > > > > qxl_destroy_monitors_object(qdev); > > qxl_surf_evict(qdev); > > > > @@ -175,14 +166,7 @@ static int qxl_drm_resume(struct drm_device *dev, > > bool thaw)> > > } > > > > qxl_create_monitors_object(qdev); > > > > - drm_helper_resume_force_mode(dev); > > - > > - console_lock(); > > - qxl_fbdev_set_suspend(qdev, 0); > > - console_unlock(); > > - > > - drm_kms_helper_poll_enable(dev); > > - return 0; > > + return drm_mode_config_helper_resume(dev); > > > > } > > > > static int qxl_pm_suspend(struct device *dev) -- Regards, Laurent Pinchart
WARNING: multiple messages have this Message-ID (diff)
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> To: Daniel Vetter <daniel@ffwll.ch> Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, virtualization@lists.linux-foundation.org, Alan Jenkins <alan.christopher.jenkins@gmail.com>, Peter Wu <peter@lekensteyn.nl>, Dave Airlie <airlied@redhat.com>, Gerd Hoffmann <kraxel@redhat.com> Subject: Re: [PATCH] qxl: fix null-pointer crash during suspend Date: Tue, 02 Oct 2018 13:05:50 +0300 [thread overview] Message-ID: <1688275.zophSNHJ2k@avalon> (raw) In-Reply-To: <20181002081422.GH11082@phenom.ffwll.local> Hello, On Tuesday, 2 October 2018 11:14:22 EEST Daniel Vetter wrote: > On Tue, Sep 04, 2018 at 10:27:47PM +0200, Peter Wu wrote: > > "crtc->helper_private" is not initialized by the QXL driver and thus the > > This is still initialized, it's the ->disable that goes boom. At least the > call to drm_crtc_helper_add is still there. The ->disable was removed in: > > commit 64581714b58bc3e16ede8dc37a025c3aa0e0eef1 > Author: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > Date: Fri Jun 30 12:36:45 2017 +0300 > > drm: Convert atomic drivers from CRTC .disable() to .atomic_disable() > > Fixes: 64581714b58b ("drm: Convert atomic drivers from CRTC .disable() to > .atomic_disable()") Cc: <stable@vger.kernel.org> # v4.14+ > Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > > I'll let Gerd pick this one up, after some testing. Also adding Laurent. Sorry for breaking it :-( Please let me know if there's something I can do to help. > > "crtc_funcs->disable" call would crash (resulting in suspend failure). > > Fix this by converting the suspend/resume functions to use the > > drm_mode_config_helper_* helpers. > > > > Tested system sleep with QEMU 3.0 using "echo mem > /sys/power/state". > > > > During suspend the following message is visible from QEMU: > > spice/server/display-channel.c:2425:display_channel_validate_surface: > > canvas address is 0x7fd05da68308 for 0 (and is NULL) > > spice/server/display-channel.c:2426:display_channel_validate_surface: > > failed on 0> > > This seems to be triggered by QXL_IO_NOTIFY_CMD after > > QXL_IO_DESTROY_PRIMARY_ASYNC, but aside from the warning things still > > seem to work (tested with both the GTK and -spice options). > > > > Signed-off-by: Peter Wu <peter@lekensteyn.nl> > > --- > > Hi, > > > > I found this issue while trying to suspend a VM that uses QXL. In order to > > see the stack trace over serial, boot with no_console_suspend. Searching > > for "qxl_drm_freeze" showed one recent report from Alan: > > https://lkml.kernel.org/r/891e334c-cf19-032c-b996-59ac166fcde1@gmail.com > > > > Kind regards, > > Peter > > --- > > > > drivers/gpu/drm/qxl/qxl_drv.c | 26 +++++--------------------- > > 1 file changed, 5 insertions(+), 21 deletions(-) > > > > diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c > > index 2445e75cf7ea..d00f45eed03c 100644 > > --- a/drivers/gpu/drm/qxl/qxl_drv.c > > +++ b/drivers/gpu/drm/qxl/qxl_drv.c > > @@ -136,20 +136,11 @@ static int qxl_drm_freeze(struct drm_device *dev) > > > > { > > > > struct pci_dev *pdev = dev->pdev; > > struct qxl_device *qdev = dev->dev_private; > > > > - struct drm_crtc *crtc; > > - > > - drm_kms_helper_poll_disable(dev); > > - > > - console_lock(); > > - qxl_fbdev_set_suspend(qdev, 1); > > - console_unlock(); > > + int ret; > > > > - /* unpin the front buffers */ > > - list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { > > - const struct drm_crtc_helper_funcs *crtc_funcs = crtc- >helper_private; > > - if (crtc->enabled) > > - (*crtc_funcs->disable)(crtc); > > - } > > + ret = drm_mode_config_helper_suspend(dev); > > + if (ret) > > + return ret; > > > > qxl_destroy_monitors_object(qdev); > > qxl_surf_evict(qdev); > > > > @@ -175,14 +166,7 @@ static int qxl_drm_resume(struct drm_device *dev, > > bool thaw)> > > } > > > > qxl_create_monitors_object(qdev); > > > > - drm_helper_resume_force_mode(dev); > > - > > - console_lock(); > > - qxl_fbdev_set_suspend(qdev, 0); > > - console_unlock(); > > - > > - drm_kms_helper_poll_enable(dev); > > - return 0; > > + return drm_mode_config_helper_resume(dev); > > > > } > > > > static int qxl_pm_suspend(struct device *dev) -- Regards, Laurent Pinchart _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2018-10-02 10:05 UTC|newest] Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-09-04 20:27 [PATCH] qxl: fix null-pointer crash during suspend Peter Wu 2018-09-04 20:27 ` Peter Wu 2018-10-01 20:13 ` Fubo Chen 2018-10-01 20:33 ` Peter Wu 2018-10-02 8:14 ` Daniel Vetter 2018-10-02 10:05 ` Laurent Pinchart [this message] 2018-10-02 10:05 ` Laurent Pinchart 2018-10-02 10:05 ` Laurent Pinchart 2018-10-02 8:14 ` Daniel Vetter
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1688275.zophSNHJ2k@avalon \ --to=laurent.pinchart@ideasonboard.com \ --cc=airlied@redhat.com \ --cc=alan.christopher.jenkins@gmail.com \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=kraxel@redhat.com \ --cc=laurent.pinchart+renesas@ideasonboard.com \ --cc=linux-kernel@vger.kernel.org \ --cc=peter@lekensteyn.nl \ --cc=virtualization@lists.linux-foundation.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.