From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757455Ab2DNAJc (ORCPT ); Fri, 13 Apr 2012 20:09:32 -0400 Received: from mailout-de.gmx.net ([213.165.64.22]:34781 "HELO mailout-de.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1757400Ab2DNAJb (ORCPT ); Fri, 13 Apr 2012 20:09:31 -0400 X-Authenticated: #12255092 X-Provags-ID: V01U2FsdGVkX1+7cYhcWPm7qfqwjbooH6BBq8zy1Yx5TDO1EWBaLw Nvj5KfYa8IyX2w From: Peter Huewe To: David Airlie Cc: Ben Skeggs , Maxim Levitsky , Dave Airlie , Alex Deucher , Jerome Glisse , =?UTF-8?q?Christian=20K=C3=B6nig?= , =?UTF-8?q?Michel=20D=C3=A4nzer?= , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Peter Huewe , stable@kernel.org Subject: [PATCH 2/2] drm/radeon: Add lock on drm_helper_resume_force_mode Date: Sat, 14 Apr 2012 02:09:05 +0200 Message-Id: <1334362145-27627-2-git-send-email-peterhuewe@gmx.de> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1334362145-27627-1-git-send-email-peterhuewe@gmx.de> References: <1334362145-27627-1-git-send-email-peterhuewe@gmx.de> X-Y-GMX-Trusted: 0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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