From patchwork Thu Aug 2 15:45:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Souptick Joarder X-Patchwork-Id: 10553927 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 2817213BB for ; Thu, 2 Aug 2018 15:42:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 15033287CE for ; Thu, 2 Aug 2018 15:42:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 089392880D; Thu, 2 Aug 2018 15:42:53 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9A21D28816 for ; Thu, 2 Aug 2018 15:42:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Subject:To:From :Date:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=4qgzrNrR23Ju4te84NuBFM7eWZV031pSnyMudG9zBhs=; b=HsNc6KPnaaT/ix VirCm+g2b9yLhCKN7WfYuzXAW0i/gR2hOlweMD6s/H7bL9fi38sYS5p3plwqbpgdaU2dTnHyibxel vUbyuGz88gsqO61162f8gKIpbSaZYuF45Z80/srhjzLJ8g0Qy0/6gsJ56jAlnGly9RI4Z9pnf7Dyp /lltReYtvqBkEsqzPrJM7PPNrJd0VXjMxV6Aq3BUc5s8++TvkQXNrFesWNliyueYeacu1Up7UA70/ z110HGFeQtqJVvfCZjJUM8V8zcQUaYuQqHUbpMpZGAN0bgseDyE0xaCq0yUoiDxyu54nk/XTY4Si8 Uxx9OAz6Gwt5FrcvHyww==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1flFkW-00049A-Rm; Thu, 02 Aug 2018 15:42:48 +0000 Received: from mail-pl0-x243.google.com ([2607:f8b0:400e:c01::243]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1flFkT-000482-J4 for linux-arm-kernel@lists.infradead.org; Thu, 02 Aug 2018 15:42:47 +0000 Received: by mail-pl0-x243.google.com with SMTP id d5-v6so1210360pll.4 for ; Thu, 02 Aug 2018 08:42:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=i26qRoRztjK7/bDF0wdcQSNKEOSb9rfFuQma4tN1EM8=; b=CHNp8ihXZz0q5toujNHpgHBHFrdc/5D4iiuay5zNwbJhxGgta7Sdabta3WVlsHygP6 rTt3cq9fr7eRswBXNjojGSGM9vdCcMH7eWks8jJ2H4yjMBSO2tICNdzlJC1CdYeA953t O/dcTxNJHkn3CVW8moSIi/Le3p5qUfRRmnjuR2Bh+qYqq/E22KJH+h5aRAUTvD6Wy0OL zMNKuqOhFewoXhy/SL7UH139gP/uKOrynI7O0gco2hFE/q7Y/u7W2lICgiPUkczTI54K vUCJStCTYQWN+2MVfg6chhREnbN3AmfnKfA+5Srs4SZraMAG6gRH5QNNj9RDgilGh9fb brWw== 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=i26qRoRztjK7/bDF0wdcQSNKEOSb9rfFuQma4tN1EM8=; b=pTBkW4NQ9atMSZFFtAM5blSiS9lXf50HtErE7UJjwm5glwQpOsvzvbetO8H++WqzT3 y0U0xral9j/7g49eNDNbKyYt6nIjMJoVor4x8uAJqPKxHkp1PdAVj4/FOQ3Z5mxTOBCs 6C/mt5huW4qAjyChvE1vYYRk9tA+jb7D7reS3kAmgvjECp4tqMIVH36XLe9J6U1KZpRi TVfIWa32mQkAEpS+0yYqwOFFYhBJjkLrCq/0lfdCMeHAvkQux9OdQhYQHIbENJthezdZ DjpJ2T4psz16c/+9QwFJPW9XP4BZqToeePehsM1EMwsWpUy9Pqx+r8GONqeWnVRvi9+u VsMg== X-Gm-Message-State: AOUpUlEmLoSNiAhw+s7ZWx1vlUPzH5x0WB/fBEdppbfWtv0GVndcLjYu jtX/KKzxmkRXNPGJhhn26H8= X-Google-Smtp-Source: AAOMgpfid5sdap9FnX76Ie/MdUKzszK8zExlZxl/Q6BtpkBlpMgWg2YgWVez0xuEkSuZI/LlMXl6WQ== X-Received: by 2002:a17:902:342:: with SMTP id 60-v6mr2833201pld.15.1533224552399; Thu, 02 Aug 2018 08:42:32 -0700 (PDT) Received: from jordon-HP-15-Notebook-PC ([49.205.216.237]) by smtp.gmail.com with ESMTPSA id d19-v6sm5451301pfe.42.2018.08.02.08.42.29 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 02 Aug 2018 08:42:30 -0700 (PDT) Date: Thu, 2 Aug 2018 21:15:17 +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, ajitn.linux@gmail.com, m.szyprowski@samsung.com Subject: [PATCH v4] gpu/drm/exynos: Convert drm_atomic_helper_suspend/resume() Message-ID: <20180802154517.GA10593@jordon-HP-15-Notebook-PC> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180802_084245_640365_304E9527 X-CRM114-Status: GOOD ( 16.10 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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. Remove suspend_state from exynos_drm_private struct as it is no more useful. Signed-off-by: Ajit Negi Signed-off-by: Souptick Joarder Tested-by: Marek Szyprowski --- v2: Address Inki Dae's comment. Remove ret variable from both suspend/resume function. v3: Tested by Marek. Updated the change log. v4: removing the return as exynos_drm_resume() now returns void. drivers/gpu/drm/exynos/exynos_drm_drv.c | 26 ++------------------------ drivers/gpu/drm/exynos/exynos_drm_drv.h | 1 - drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 17 ----------------- drivers/gpu/drm/exynos/exynos_drm_fbdev.h | 10 ---------- 4 files changed, 2 insertions(+), 52 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c index b599f74..6f76baf 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c @@ -149,37 +149,15 @@ 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 (!drm_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 void exynos_drm_resume(struct device *dev) { struct drm_device *drm_dev = dev_get_drvdata(dev); - struct exynos_drm_private *private; - - if (!drm_dev) - return; - 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); + drm_mode_config_helper_resume(drm_dev); } static const struct dev_pm_ops exynos_drm_pm_ops = { diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h index c737c4b..7349e7c 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.h +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h @@ -195,7 +195,6 @@ struct drm_exynos_file_private { */ struct exynos_drm_private { struct drm_fb_helper *fb_helper; - struct drm_atomic_state *suspend_state; struct device *g2d_dev; struct device *dma_dev; 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