From patchwork Thu Jul 26 15:54:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Souptick Joarder X-Patchwork-Id: 10546657 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 C137E174A for ; Fri, 27 Jul 2018 07:01:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B282A2B4C9 for ; Fri, 27 Jul 2018 07:01:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A481B2B4CC; Fri, 27 Jul 2018 07:01:50 +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 391602B4C9 for ; Fri, 27 Jul 2018 07:01:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B2DF16E8F7; Fri, 27 Jul 2018 07:01:22 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) by gabe.freedesktop.org (Postfix) with ESMTPS id 663556E23F for ; Thu, 26 Jul 2018 15:52:17 +0000 (UTC) Received: by mail-pf1-x443.google.com with SMTP id e13-v6so722360pff.7 for ; Thu, 26 Jul 2018 08:52:17 -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=AeDt/GpAfzOMrkrlRIMneLTkkm1bS5veHSM4fjYpZTA=; b=m6YdY52VtUWOI+3jnlFuqAJGyEXzHrcMd9RjjK5qjPdls2E5E4DUy/T81zmlIhOaKH 3oumusye5DlJ7CWHwg9zbBGD7ESVgM11LLcjgWtjG6bLahxrMsKWnZn7/0dj5dkZNaPn M72elSAc9IgPDh4IW47Dl5Sj0ImqNSEWj0168plUTOuAjKO2N6fY9jt0xb+gpuLGE+Uf CAlsJ7N3evf/iq8BGvg8wlgEY81Hggelm+2oDb1Zl/VTwnnDcgOnh7MijDFVGeqa9SW8 PixO+j5XFHYFYZI9zSenAzYoXAzgM4eh4Nvl2VSyt354YSzxqExOpJdBTwLQFUTqecoM 31+A== X-Gm-Message-State: AOUpUlFLu5foMIUlukVJoSWYAhy1I2d61rED1hKuyMLoJfQuoKMY0+1j UZSeSvdGRZu/tWsKmKm3GXI= X-Google-Smtp-Source: AAOMgpdfDcBFV1l6CP80ibBtsXAx/Xwt3HO3hXfmJR7DLT7H02armsEHoBeTWU3+rQWV3C3nd0OTZQ== X-Received: by 2002:a62:1815:: with SMTP id 21-v6mr2661102pfy.227.1532620336936; Thu, 26 Jul 2018 08:52:16 -0700 (PDT) Received: from jordon-HP-15-Notebook-PC ([49.205.219.162]) by smtp.gmail.com with ESMTPSA id v3-v6sm8771309pgb.54.2018.07.26.08.52.14 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Jul 2018 08:52:15 -0700 (PDT) Date: Thu, 26 Jul 2018 21:24:59 +0530 From: Souptick Joarder To: inki.dae@samsung.com, jy0922.shim@samsung.com, sw0312.kim@samsung.com, kyungmin.park@samsung.com, airlied@linux.ie, kgene@kernel.org, krzk@kernel.org, daniel@ffwll.ch Subject: [PATCH v2] gpu/drm/exynos: Convert drm_atomic_helper_suspend/resume() Message-ID: <20180726155459.GA30138@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: Fri, 27 Jul 2018 07:01:20 +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: ajitn.linux@gmail.com, linux-samsung-soc@vger.kernel.org, sabyasachi.linux@gmail.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, brajeswar.linux@gmail.com, linux-arm-kernel@lists.infradead.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(). exynos_drm_fbdev_suspend/resume can be removed as drm_mode_config_helper_suspend/resume has implement the same in generic way. Signed-off-by: Souptick Joarder Signed-off-by: Ajit Negi Tested-by: Marek Szyprowski --- v2: Address Inki Dae's comment. Remove ret variable from both suspend/resume function. drivers/gpu/drm/exynos/exynos_drm_drv.c | 26 ++++---------------------- drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 17 ----------------- drivers/gpu/drm/exynos/exynos_drm_fbdev.h | 10 ---------- 3 files changed, 4 insertions(+), 49 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c index a81b4a5..46d28cd 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c @@ -151,39 +151,21 @@ static void exynos_drm_postclose(struct drm_device *dev, struct drm_file *file) static int exynos_drm_suspend(struct device *dev) { struct drm_device *drm_dev = dev_get_drvdata(dev); - struct exynos_drm_private *private; - if (pm_runtime_suspended(dev) || !drm_dev) + if (pm_runtime_suspended(dev)) return 0; - private = drm_dev->dev_private; - - drm_kms_helper_poll_disable(drm_dev); - exynos_drm_fbdev_suspend(drm_dev); - private->suspend_state = drm_atomic_helper_suspend(drm_dev); - if (IS_ERR(private->suspend_state)) { - exynos_drm_fbdev_resume(drm_dev); - drm_kms_helper_poll_enable(drm_dev); - return PTR_ERR(private->suspend_state); - } - - return 0; + return drm_mode_config_helper_suspend(drm_dev); } static int exynos_drm_resume(struct device *dev) { struct drm_device *drm_dev = dev_get_drvdata(dev); - struct exynos_drm_private *private; - if (pm_runtime_suspended(dev) || !drm_dev) + if (pm_runtime_suspended(dev)) return 0; - private = drm_dev->dev_private; - drm_atomic_helper_resume(drm_dev, private->suspend_state); - exynos_drm_fbdev_resume(drm_dev); - drm_kms_helper_poll_enable(drm_dev); - - return 0; + return drm_mode_config_helper_resume(drm_dev); } #endif diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c index 132dd52..918dd2c 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c @@ -270,20 +270,3 @@ void exynos_drm_fbdev_fini(struct drm_device *dev) private->fb_helper = NULL; } -void exynos_drm_fbdev_suspend(struct drm_device *dev) -{ - struct exynos_drm_private *private = dev->dev_private; - - console_lock(); - drm_fb_helper_set_suspend(private->fb_helper, 1); - console_unlock(); -} - -void exynos_drm_fbdev_resume(struct drm_device *dev) -{ - struct exynos_drm_private *private = dev->dev_private; - - console_lock(); - drm_fb_helper_set_suspend(private->fb_helper, 0); - console_unlock(); -} diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.h b/drivers/gpu/drm/exynos/exynos_drm_fbdev.h index b338472..6840b6a 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.h +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.h @@ -19,8 +19,6 @@ int exynos_drm_fbdev_init(struct drm_device *dev); void exynos_drm_fbdev_fini(struct drm_device *dev); -void exynos_drm_fbdev_suspend(struct drm_device *drm); -void exynos_drm_fbdev_resume(struct drm_device *drm); #else @@ -39,14 +37,6 @@ static inline void exynos_drm_fbdev_restore_mode(struct drm_device *dev) #define exynos_drm_output_poll_changed (NULL) -static inline void exynos_drm_fbdev_suspend(struct drm_device *drm) -{ -} - -static inline void exynos_drm_fbdev_resume(struct drm_device *drm) -{ -} - #endif #endif