From patchwork Wed Dec 12 13:06:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1866091 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id BF9F63FC81 for ; Wed, 12 Dec 2012 13:30:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AD4A7E6570 for ; Wed, 12 Dec 2012 05:30:59 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ee0-f49.google.com (mail-ee0-f49.google.com [74.125.83.49]) by gabe.freedesktop.org (Postfix) with ESMTP id B0C86E62D6 for ; Wed, 12 Dec 2012 05:07:33 -0800 (PST) Received: by mail-ee0-f49.google.com with SMTP id c4so424148eek.36 for ; Wed, 12 Dec 2012 05:07:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=cen866IXT/YtngyfY+yRX/Ij/KpRSLJgKUI9526AlIg=; b=S+/kR+bnsTYKIaHrqjkIKravS2IkeHKLbCPgXq/ZyhaOVaG6vpI60l+OYrNdZLtfqT G9Tdt/fFGtrjS55v3kIOipmHIsdr5z1znogIk3j1UCyRpV4yfKy78MweC/v4cuNshuco jgcMTDqV0QRxLsDBKwXlxiHhM87YtJ/CB46oE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=cen866IXT/YtngyfY+yRX/Ij/KpRSLJgKUI9526AlIg=; b=Hj4ncGECoZdFTXuScHIpeJEwiOzJxmcZ+5OIRy/oELsD1psqB07W9RJc6yRh0NAV2S eICtHxFJEdLWWmQ0SdNDFdHp36DdWcFzU3Dw8/iAuwlTN2p85Pi679m6TzinyX6Xp+of 4vWE1efDvN3DvImOtm3pbSYb3J5VQ9Ex2A0x+D3sSNCtIPAxux/sqYT33NqcKGpzlUng QjaU6PcqapxDN1frs6/14YKg/2tHs/+trn1RPW53Y2LqDS1EsWMq77hfF2AsE5K9VmMR yJWTXQ8LDFkEJSPZxcrg/8D2OPXKVqnboko15jxp0AXH4jGozNdYjoqHV8aDCgexkG+I 71cg== Received: by 10.14.225.72 with SMTP id y48mr2693856eep.46.1355317652620; Wed, 12 Dec 2012 05:07:32 -0800 (PST) Received: from biers.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id r1sm55868541eeo.2.2012.12.12.05.07.31 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 12 Dec 2012 05:07:32 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 08/37] drm/shmobile: use drm_modeset_lock_all Date: Wed, 12 Dec 2012 14:06:48 +0100 Message-Id: <1355317637-16742-9-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1355317637-16742-1-git-send-email-daniel.vetter@ffwll.ch> References: <1355317637-16742-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQlG6pQWK4poShYdU+eAp13gQrOpXzIV7xP3GfWGP0OzMwyNwiEVWmsMzqR0UOJehk+sOlyf Cc: Nouveau Dev , Intel Graphics Development , Radeon Dev , Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Only a resume method to account for. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/shmobile/shmob_drm_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/shmobile/shmob_drm_drv.c index 1c350fc..e77f255 100644 --- a/drivers/gpu/drm/shmobile/shmob_drm_drv.c +++ b/drivers/gpu/drm/shmobile/shmob_drm_drv.c @@ -313,9 +313,9 @@ static int shmob_drm_pm_resume(struct device *dev) { struct shmob_drm_device *sdev = dev_get_drvdata(dev); - mutex_lock(&sdev->ddev->mode_config.mutex); + drm_modeset_lock_all(dev); shmob_drm_crtc_resume(&sdev->crtc); - mutex_unlock(&sdev->ddev->mode_config.mutex); + drm_modeset_unlock_all(dev); drm_kms_helper_poll_enable(sdev->ddev); return 0;