From: Peter Huewe <peterhuewe@gmx.de>
To: David Airlie <airlied@linux.ie>
Cc: "Ben Skeggs" <bskeggs@redhat.com>,
"Maxim Levitsky" <maximlevitsky@gmail.com>,
"Dave Airlie" <airlied@redhat.com>,
"Alex Deucher" <alexander.deucher@amd.com>,
"Jerome Glisse" <jglisse@redhat.com>,
"Christian König" <deathsimple@vodafone.de>,
"Michel Dänzer" <michel.daenzer@amd.com>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
stable@vger.kernel.org, "Peter Huewe" <peterhuewe@gmx.de>,
stable@kernel.org
Subject: [PATCH 1/2] drm/nouveau: Add lock on drm_helper_resume_force_mode
Date: Sat, 14 Apr 2012 02:09:04 +0200 [thread overview]
Message-ID: <1334362145-27627-1-git-send-email-peterhuewe@gmx.de> (raw)
mode_config should be locked when calling drm_helper_resume_force_mode.
This patch adds the lock, similar to #927a2f119.
Cc: stable@kernel.org
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
---
drivers/gpu/drm/nouveau/nouveau_drv.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
index 4f2030b..6260abe 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.c
@@ -375,7 +375,9 @@ nouveau_pci_resume(struct pci_dev *pdev)
nv_crtc->lut.depth = 0;
}
+ mutex_lock(&dev->mode_config.mutex);
drm_helper_resume_force_mode(dev);
+ mutex_unlock(&dev->mode_config.mutex);
list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
--
1.7.3.4
next reply other threads:[~2012-04-14 0:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-14 0:09 Peter Huewe [this message]
2012-04-14 0:09 ` [PATCH 2/2] drm/radeon: " Peter Huewe
2012-04-14 0:52 ` [PATCH 1/2] drm/nouveau: " Jonathan Nieder
2012-04-14 0:59 ` Peter Hüwe
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=1334362145-27627-1-git-send-email-peterhuewe@gmx.de \
--to=peterhuewe@gmx.de \
--cc=airlied@linux.ie \
--cc=airlied@redhat.com \
--cc=alexander.deucher@amd.com \
--cc=bskeggs@redhat.com \
--cc=deathsimple@vodafone.de \
--cc=dri-devel@lists.freedesktop.org \
--cc=jglisse@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maximlevitsky@gmail.com \
--cc=michel.daenzer@amd.com \
--cc=stable@kernel.org \
--cc=stable@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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®