From patchwork Tue Aug 11 11:37:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 6991831 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 2D3E89F358 for ; Tue, 11 Aug 2015 11:38:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5CDD12065A for ; Tue, 11 Aug 2015 11:38:45 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 3EAFF2062F for ; Tue, 11 Aug 2015 11:38:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 559C36E517; Tue, 11 Aug 2015 04:38:43 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f182.google.com (mail-wi0-f182.google.com [209.85.212.182]) by gabe.freedesktop.org (Postfix) with ESMTPS id E37F46E517 for ; Tue, 11 Aug 2015 04:38:41 -0700 (PDT) Received: by wijp15 with SMTP id p15so172422614wij.0 for ; Tue, 11 Aug 2015 04:38:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9zJ5n7AS/hA1aQRjH4c/glHtJue8x/al+w4nD5BLxkI=; b=ava1VqQeaDMWy+fHWg9gMAwc/NmDc46qoT5Dcr1jqkQbkwsTMTt5qgAlv8RhFS94pC xn6/tfIIk5InVydocAZRuRiUZ3Bhhvex1jCXjQE9NMA0foPlQyEW/V7EX/IKyOPun0lq T6xbecLsb0BUTF4QDeENH9kuc6nDaaxTqabvg2sRVmAhclMExn+GahM9F/3YV/bUNlRD 4BPKCW6dI/SoldzUpdp7Rw2aQeUDYzan6Z26or/dzeEskd+thvFqwIDjMFF01c/3epl2 tHcMxn+21poauFtIAsXKYAb5uSnDhT69+zDqEEqAunLwfIET7q7ONgZM3HJzvlAM8USL boUg== X-Received: by 10.180.101.138 with SMTP id fg10mr36139392wib.46.1439293120338; Tue, 11 Aug 2015 04:38:40 -0700 (PDT) Received: from localhost (port-49969.pppoe.wtnet.de. [46.59.195.205]) by smtp.gmail.com with ESMTPSA id v9sm2588080wjq.41.2015.08.11.04.38.39 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Aug 2015 04:38:39 -0700 (PDT) From: Thierry Reding To: dri-devel@lists.freedesktop.org Subject: [PATCH 3/3] drm/tegra: Implement subsystem-level suspend/resume Date: Tue, 11 Aug 2015 13:37:45 +0200 Message-Id: <1439293065-15941-3-git-send-email-thierry.reding@gmail.com> X-Mailer: git-send-email 2.4.5 In-Reply-To: <1439293065-15941-1-git-send-email-thierry.reding@gmail.com> References: <1439293065-15941-1-git-send-email-thierry.reding@gmail.com> 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.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 From: Thierry Reding Use the drm_atomic_helper_suspend() and drm_atomic_helper_resume() helpers to implement subsystem-level suspend/resume. Signed-off-by: Thierry Reding --- drivers/gpu/drm/tegra/drm.c | 9 +++++++++ drivers/gpu/drm/tegra/drm.h | 2 ++ 2 files changed, 11 insertions(+) diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index 767dce20736c..fe5fcb777fb4 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -1022,16 +1022,25 @@ static int host1x_drm_remove(struct host1x_device *dev) static int host1x_drm_suspend(struct device *dev) { struct drm_device *drm = dev_get_drvdata(dev); + struct tegra_drm *tegra = drm->dev_private; drm_kms_helper_poll_disable(drm); + tegra->state = drm_atomic_helper_suspend(drm); + if (IS_ERR(tegra->state)) { + drm_kms_helper_poll_enable(drm); + return PTR_ERR(tegra->state); + } + return 0; } static int host1x_drm_resume(struct device *dev) { struct drm_device *drm = dev_get_drvdata(dev); + struct tegra_drm *tegra = drm->dev_private; + drm_atomic_helper_resume(drm, tegra->state); drm_kms_helper_poll_enable(drm); return 0; diff --git a/drivers/gpu/drm/tegra/drm.h b/drivers/gpu/drm/tegra/drm.h index dfbc0868dc6f..c31d43150ce1 100644 --- a/drivers/gpu/drm/tegra/drm.h +++ b/drivers/gpu/drm/tegra/drm.h @@ -57,6 +57,8 @@ struct tegra_drm { struct work_struct work; struct mutex lock; } commit; + + struct drm_atomic_state *state; }; struct tegra_drm_client;