[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1334362145-27627-2-git-send-email-peterhuewe@gmx.de>
Date: Sat, 14 Apr 2012 02:09:05 +0200
From: Peter Huewe <peterhuewe@....de>
To: David Airlie <airlied@...ux.ie>
Cc: Ben Skeggs <bskeggs@...hat.com>,
Maxim Levitsky <maximlevitsky@...il.com>,
Dave Airlie <airlied@...hat.com>,
Alex Deucher <alexander.deucher@....com>,
Jerome Glisse <jglisse@...hat.com>,
Christian König <deathsimple@...afone.de>,
Michel Dänzer <michel.daenzer@....com>,
dri-devel@...ts.freedesktop.org, linux-kernel@...r.kernel.org,
stable@...r.kernel.org, Peter Huewe <peterhuewe@....de>,
stable@...nel.org
Subject: [PATCH 2/2] drm/radeon: Add lock on drm_helper_resume_force_mode
mode_config should be locked when calling drm_helper_resume_force_mode.
This patch adds the lock, similar to #927a2f119.
Cc: stable@...nel.org
Signed-off-by: Peter Huewe <peterhuewe@....de>
---
drivers/gpu/drm/radeon/radeon_device.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index ea7df16..d287f23 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -973,7 +973,9 @@ int radeon_resume_kms(struct drm_device *dev)
/* reset hpd state */
radeon_hpd_init(rdev);
/* blat the mode back in */
+ mutex_lock(&dev->mode_config.mutex);
drm_helper_resume_force_mode(dev);
+ mutex_unlock(&dev->mode_config.mutex);
/* turn on display hw */
list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON);
--
1.7.3.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists