From patchwork Thu Jan 10 20:47:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1962531 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id C07ADDF264 for ; Thu, 10 Jan 2013 21:03:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A038CE64FF for ; Thu, 10 Jan 2013 13:03:17 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by gabe.freedesktop.org (Postfix) with ESMTP id D98C2E638A for ; Thu, 10 Jan 2013 12:48:41 -0800 (PST) Received: by mail-wi0-f171.google.com with SMTP id hn14so1524006wib.4 for ; Thu, 10 Jan 2013 12:48:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=z1/TLJ4w+pJQACt5lsyz2XdwoBcIQ03skZkue1ncBto=; b=Lyz1deHNNLgnVVCwfVA4y1Y4oN3cxx/53HsBigXqg7UiTDL5y9UPyEA9Ctqin2971y kiNx2e089fBf/neRWjocMbODinaSVtykGYeyiwN4dmcOp6FtTZyncQkeerNlWoNJ3che uMPScuVSJ6oRVdZHBWl5msGYafuAzU6MwNQ28= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=z1/TLJ4w+pJQACt5lsyz2XdwoBcIQ03skZkue1ncBto=; b=PeC1idgE+lS/CGcbam+Jt7yh5kSgpVgxuY5KgRdvMw5p9Cpg5qxxMuOfTyaerXrO/K GsHBPF4+y9Rhp/JEPiPn8IN91XzARqAVoHPlCMf0PMnDpRdYdNzfp+6+z+JGb3VZpKpS tdD862CnTtAr+xK3snrK/j9n40GK9vnrSjii7hQgY/jcXriiliKyA9YfyIzyTdbViKOn S9VLaPENFRVe1Nu1nu915q4siPm4b99kKnO11UlZEFkDH6Nabo0o5HP7cvy+XErMFYlm Z5OiL6htydG9YQXsPxazzLB4DoAeTwiJPejPrwn39D9uxnFhyeeIrD88IEHRyj7W0Dn4 fEaA== X-Received: by 10.180.97.68 with SMTP id dy4mr11480491wib.7.1357850921093; Thu, 10 Jan 2013 12:48:41 -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 hu8sm9975655wib.6.2013.01.10.12.48.40 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Jan 2013 12:48:40 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 14/35] drm/shmobile: use drm_modeset_lock_all Date: Thu, 10 Jan 2013 21:47:55 +0100 Message-Id: <1357850897-27102-15-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1357850897-27102-1-git-send-email-daniel.vetter@ffwll.ch> References: <1357850897-27102-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQlxRzRVh908vS+3/rc+qH+V6nxPKhG7Okd0lBWttsL22rw/FH1UZ7O71niNDPQOSQ+b/us8 Cc: 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. v2: Fixup compilation. 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..d701219 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(sdev->ddev); shmob_drm_crtc_resume(&sdev->crtc); - mutex_unlock(&sdev->ddev->mode_config.mutex); + drm_modeset_unlock_all(sdev->ddev); drm_kms_helper_poll_enable(sdev->ddev); return 0;