From patchwork Wed Sep 23 18:26:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7251821 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AC8B19F40A for ; Wed, 23 Sep 2015 18:24:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D975F20A30 for ; Wed, 23 Sep 2015 18:24:03 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id A281720A3F for ; Wed, 23 Sep 2015 18:24:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7A7C66E036; Wed, 23 Sep 2015 11:24:00 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com [209.85.212.174]) by gabe.freedesktop.org (Postfix) with ESMTPS id 811986E036 for ; Wed, 23 Sep 2015 11:23:58 -0700 (PDT) Received: by wicfx3 with SMTP id fx3so81797343wic.0 for ; Wed, 23 Sep 2015 11:23:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id; bh=D+RhJmTokaU8nZGypOcYSLJ9gesJ614jWx1V2D44WUA=; b=SD1n6qVK9JNayleMg0MPv4ez40gzcIT4bEo4cAB+o5uQ6NmAxSQ1V7rBGDz0RnL3kH 77xED2B4Aev1X8EJkV+kZzuuNYkF3nCj/Q0qMeN9KJh4o3RqcU1lQGq6XBgSegYDXLoq ZPQZ9EXKOmQ7ywoTzogCG2Incb3wcyk4aqi8Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=D+RhJmTokaU8nZGypOcYSLJ9gesJ614jWx1V2D44WUA=; b=krc6QKWZtN8Xbnnxut+XHsMoUGXYM9gzSkyEdJLFkATSojH58ip61JqlAc7K3n0Xi/ 9Mfq02Gq6kkdWCnrAYaT8h7dzz22YUDhH+l22a2FVeAuW3Ny3+XGIiHn7rbzjphzbnHK 2Jqfh9es1DkWC6cTN1kSAHZGxxHxdACZdA4DvdH7T0VdC/0vMlD2Apa1FDbkgIWhHHr6 S/U9bN2XDmJtw/Pl80LOoJUG2SNA4xrEj4vKsN+WFta93WxMQeKrpL9AZ+/gin/6k/hW Fo/31hc7DyA2un1SAYtV+fTZ2b5VYbbR9UeeXu6fDbaJBz7xf2jV2f0Ng2IGAd6/bmkN mMKQ== X-Gm-Message-State: ALoCoQlr5cZngae5Y8KQwwTk46v+YQi3zBMbOe0jDn02PGr+5ynDxG0QdE4Fji1HEnZeWMlBkZun X-Received: by 10.194.223.104 with SMTP id qt8mr28039540wjc.60.1443032637022; Wed, 23 Sep 2015 11:23:57 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by smtp.gmail.com with ESMTPSA id gc19sm9792137wic.19.2015.09.23.11.23.55 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Sep 2015 11:23:56 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH] drm/radeon: Sprinkle drm_modeset_lock_all to appease locking checks Date: Wed, 23 Sep 2015 20:26:45 +0200 Message-Id: <1443032805-20559-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.5.1 Cc: Daniel Vetter , Borislav Petkov , Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In commit 7a3f3d6667f5f9ffd1517f6b21d64bbf5312042c Author: Daniel Vetter Date: Thu Jul 9 23:44:28 2015 +0200 drm: Check locking in drm_for_each_connector I added locking checks to drm_for_each_connector but failed that through drm_helper_connector_dpms -> drm_helper_choose_encoder_dpms it's used in a few more places in the radeon resume/suspend code. Fix them up. Note that we could use the connector iterator macros in there too, but that's for the future. Reported-and-tested-by: Borislav Petkov Cc: Borislav Petkov Cc: Alex Deucher Signed-off-by: Daniel Vetter --- drivers/gpu/drm/radeon/radeon_device.c | 4 ++++ 1 file changed, 4 insertions(+) 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);