From: Daniel Vetter <daniel@ffwll.ch> To: Borislav Petkov <bp@alien8.de> Cc: "Daniel Vetter" <daniel@ffwll.ch>, "Alex Deucher" <alexdeucher@gmail.com>, "Alex Deucher" <alexander.deucher@amd.com>, "Christian König" <christian.koenig@amd.com>, "Maling list - DRI developers" <dri-devel@lists.freedesktop.org>, lkml <linux-kernel@vger.kernel.org> Subject: Re: WARNING: CPU: 4 PID: 863 at include/drm/drm_crtc.h:1577 drm_helper_choose_encoder_dpms+0x88/0x90() Date: Wed, 23 Sep 2015 16:44:50 +0200 [thread overview] Message-ID: <20150923144450.GD3383@phenom.ffwll.local> (raw) In-Reply-To: <20150923085950.GA3440@pd.tnic> On Wed, Sep 23, 2015 at 10:59:51AM +0200, Borislav Petkov wrote: > On Wed, Sep 23, 2015 at 09:25:23AM +0200, Daniel Vetter wrote: > > Strange thing is that I've tested this on a radeon over here and I don't > > see this backtrace ... wut. Below diff should appease the backtraces at > > least. > > Doesn't look like it. sorry I sprinkled the locking stuff in the wrong places. Still confused why the resume side doesn't blow up anywhere ... Oh well. New patch below. Thanks, Daniel diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index d8319dae8358..f3f562f6d848 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -1573,10 +1573,12 @@ int radeon_suspend_kms(struct drm_device *dev, bool suspend, bool fbcon) drm_kms_helper_poll_disable(dev); + drm_modeset_lock_all(dev); /* turn off display hw */ list_for_each_entry(connector, &dev->mode_config.connector_list, head) { drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF); } + drm_modeset_unlock_all(dev); /* unpin the front buffers and cursors */ list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { @@ -1734,9 +1736,11 @@ int radeon_resume_kms(struct drm_device *dev, bool resume, bool fbcon) if (fbcon) { drm_helper_resume_force_mode(dev); /* turn on display hw */ + drm_modeset_lock_all(dev); list_for_each_entry(connector, &dev->mode_config.connector_list, head) { drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON); } + drm_modeset_unlock_all(dev); } drm_kms_helper_poll_enable(dev); -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Vetter <daniel@ffwll.ch> To: Borislav Petkov <bp@alien8.de> Cc: lkml <linux-kernel@vger.kernel.org>, "Maling list - DRI developers" <dri-devel@lists.freedesktop.org>, "Alex Deucher" <alexander.deucher@amd.com>, "Christian König" <christian.koenig@amd.com> Subject: Re: WARNING: CPU: 4 PID: 863 at include/drm/drm_crtc.h:1577 drm_helper_choose_encoder_dpms+0x88/0x90() Date: Wed, 23 Sep 2015 16:44:50 +0200 [thread overview] Message-ID: <20150923144450.GD3383@phenom.ffwll.local> (raw) In-Reply-To: <20150923085950.GA3440@pd.tnic> On Wed, Sep 23, 2015 at 10:59:51AM +0200, Borislav Petkov wrote: > On Wed, Sep 23, 2015 at 09:25:23AM +0200, Daniel Vetter wrote: > > Strange thing is that I've tested this on a radeon over here and I don't > > see this backtrace ... wut. Below diff should appease the backtraces at > > least. > > Doesn't look like it. sorry I sprinkled the locking stuff in the wrong places. Still confused why the resume side doesn't blow up anywhere ... Oh well. New patch below. Thanks, Daniel diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index d8319dae8358..f3f562f6d848 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -1573,10 +1573,12 @@ int radeon_suspend_kms(struct drm_device *dev, bool suspend, bool fbcon) drm_kms_helper_poll_disable(dev); + drm_modeset_lock_all(dev); /* turn off display hw */ list_for_each_entry(connector, &dev->mode_config.connector_list, head) { drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF); } + drm_modeset_unlock_all(dev); /* unpin the front buffers and cursors */ list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { @@ -1734,9 +1736,11 @@ int radeon_resume_kms(struct drm_device *dev, bool resume, bool fbcon) if (fbcon) { drm_helper_resume_force_mode(dev); /* turn on display hw */ + drm_modeset_lock_all(dev); list_for_each_entry(connector, &dev->mode_config.connector_list, head) { drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON); } + drm_modeset_unlock_all(dev); } drm_kms_helper_poll_enable(dev); -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2015-09-23 14:42 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-09-21 13:31 WARNING: CPU: 4 PID: 863 at include/drm/drm_crtc.h:1577 drm_helper_choose_encoder_dpms+0x88/0x90() Borislav Petkov 2015-09-22 19:06 ` Borislav Petkov 2015-09-22 19:06 ` Borislav Petkov 2015-09-22 19:58 ` Alex Deucher 2015-09-22 19:58 ` Alex Deucher 2015-09-22 20:21 ` Borislav Petkov 2015-09-22 20:21 ` Borislav Petkov 2015-09-22 20:54 ` Alex Deucher 2015-09-22 20:54 ` Alex Deucher 2015-09-23 7:25 ` Daniel Vetter 2015-09-23 8:59 ` Borislav Petkov 2015-09-23 8:59 ` Borislav Petkov 2015-09-23 14:44 ` Daniel Vetter [this message] 2015-09-23 14:44 ` Daniel Vetter 2015-09-23 16:06 ` Borislav Petkov 2015-09-23 16:06 ` Borislav Petkov 2015-09-23 16:18 ` Borislav Petkov 2015-09-23 16:18 ` Borislav Petkov 2015-09-26 16:46 ` WARNING: CPU: 4 PID: 863 at include/drm/drm_crtc.h:1577 drm_helper_choose_encoder_dpms+0x88/0x90() - evildoer found and neutralized Borislav Petkov 2015-09-26 16:46 ` Borislav Petkov 2015-09-29 8:50 ` Jiang Liu 2015-09-29 10:51 ` Borislav Petkov 2015-09-29 10:51 ` Borislav Petkov 2015-09-30 7:45 ` Jiang Liu 2015-09-30 7:45 ` Jiang Liu 2015-09-30 12:44 ` Joerg Roedel 2015-09-30 17:00 ` Jiang Liu 2015-09-30 17:36 ` Borislav Petkov 2015-09-30 17:36 ` Borislav Petkov 2015-09-30 18:07 ` Joerg Roedel 2015-09-30 18:07 ` Joerg Roedel 2015-10-03 7:36 ` Jiang Liu 2015-10-03 7:36 ` Jiang Liu 2015-10-03 9:35 ` Borislav Petkov 2015-10-03 9:35 ` Borislav Petkov 2015-10-05 10:03 ` Joerg Roedel 2015-10-05 10:03 ` Joerg Roedel 2015-10-06 13:13 ` Jiang Liu 2015-10-09 10:24 ` Joerg Roedel 2015-10-09 10:24 ` Joerg Roedel 2015-09-30 18:06 ` Joerg Roedel 2015-09-30 18:06 ` Joerg Roedel
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=20150923144450.GD3383@phenom.ffwll.local \ --to=daniel@ffwll.ch \ --cc=alexander.deucher@amd.com \ --cc=alexdeucher@gmail.com \ --cc=bp@alien8.de \ --cc=christian.koenig@amd.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=linux-kernel@vger.kernel.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.