From patchwork Sat Jul 28 15:40:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Souptick Joarder X-Patchwork-Id: 10548587 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E6798A754 for ; Mon, 30 Jul 2018 07:22:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CD1E6297DE for ; Mon, 30 Jul 2018 07:22:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BF3BE298EE; Mon, 30 Jul 2018 07:22:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7994E297DE for ; Mon, 30 Jul 2018 07:22:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BC2396E093; Mon, 30 Jul 2018 07:21:49 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pl0-x241.google.com (mail-pl0-x241.google.com [IPv6:2607:f8b0:400e:c01::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id A6FCC6E1C9 for ; Sat, 28 Jul 2018 15:37:23 +0000 (UTC) Received: by mail-pl0-x241.google.com with SMTP id m16-v6so3584119pls.11 for ; Sat, 28 Jul 2018 08:37:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=ft7ulf9KrPoL8Oqnc9vCFSde04xHegaQJOgM+n/MNbg=; b=kA+p2nCTOiJRNBC4bFECED3WPSNXXG8w6uk+ecHFVYBEEYp9pzl/jD3hgnwBXyeRt5 vi230tnPC1+tb69I/k0szcf+S/WiMYIzEcN4AF3uBC8W0bqmwCiCyezFJ7xhMp5iR+Ai XGOoSOsQLTZTKJlYqA7KIgxXc9ug9iy92aOB4BYr2O0ctQZ3Xig9FKcnp4/jqTDZfBia 4DU9xe2KIpHIMGXHzXyvfmGjXWtfZq67i+3pzNWoHdsLrZp+nLbUJhEtLw8RyUc2fahi QAxa+q+PYWFwz4iJ9CxsgLMl0XzRd4V1Vc+4K9xstVOP+jVHP+M5qHxPa6CykdGLGNd3 AgFg== X-Gm-Message-State: AOUpUlEZRlKOceKHTwB/y3DlB2utqJIkrGFvtwJDZHzk7lDwDQCqhnMn z4zfB8KBpGomn6yfG1b8n7ZjkZm4 X-Google-Smtp-Source: AAOMgpfISJIAlCWvbZH/fiHVu8dKdHt6Gj0TEkqIQXBgTotddbRzehCgwEGhZ5c2hShZwaAillXCmw== X-Received: by 2002:a17:902:6ac7:: with SMTP id i7-v6mr10350468plt.288.1532792243210; Sat, 28 Jul 2018 08:37:23 -0700 (PDT) Received: from jordon-HP-15-Notebook-PC ([183.82.18.16]) by smtp.gmail.com with ESMTPSA id c1-v6sm9525584pfi.142.2018.07.28.08.37.21 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 28 Jul 2018 08:37:21 -0700 (PDT) Date: Sat, 28 Jul 2018 21:10:07 +0530 From: Souptick Joarder To: laurent.pinchart@ideasonboard.com, airlied@linux.ie, ajitn.linux@gmail.com Subject: [PATCH] drm/rcar-du: Convert drm_atomic_helper_suspend/resume() Message-ID: <20180728154007.GA28426@jordon-HP-15-Notebook-PC> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Mailman-Approved-At: Mon, 30 Jul 2018 07:21:17 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP convert drm_atomic_helper_suspend/resume() to use drm_mode_config_helper_suspend/resume(). Signed-off-by: Souptick Joarder Signed-off-by: Ajit Negi --- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c index 02aee6c..288220f 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c @@ -357,32 +357,15 @@ static void rcar_du_lastclose(struct drm_device *dev) static int rcar_du_pm_suspend(struct device *dev) { struct rcar_du_device *rcdu = dev_get_drvdata(dev); - struct drm_atomic_state *state; - drm_kms_helper_poll_disable(rcdu->ddev); - drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, true); - - state = drm_atomic_helper_suspend(rcdu->ddev); - if (IS_ERR(state)) { - drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, false); - drm_kms_helper_poll_enable(rcdu->ddev); - return PTR_ERR(state); - } - - rcdu->suspend_state = state; - - return 0; + return drm_mode_config_helper_suspend(rcdu->ddev); } static int rcar_du_pm_resume(struct device *dev) { struct rcar_du_device *rcdu = dev_get_drvdata(dev); - drm_atomic_helper_resume(rcdu->ddev, rcdu->suspend_state); - drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, false); - drm_kms_helper_poll_enable(rcdu->ddev); - - return 0; + return drm_mode_config_helper_resume(rcdu->ddev); } #endif