From patchwork Wed Jul 18 20:49:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Souptick Joarder X-Patchwork-Id: 10533245 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 536EB600F4 for ; Wed, 18 Jul 2018 20:47:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 40D3F29C25 for ; Wed, 18 Jul 2018 20:47:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3188429C57; Wed, 18 Jul 2018 20:47:40 +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 BF96A29C25 for ; Wed, 18 Jul 2018 20:47:39 +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=L2NQI0kGbbLHRwqN8RhZw+Aej+Hzphx3dJuXRv148/0=; b=FYah+4U8FPRvEU TxlkrP24xANsyGUYyEv3omqq6UoajJLSHrXjJJaESboa9WLDEo43A2TaOPlsG26NSGpLUjOE/nLFB fk4rW18dwAPLMY+9FQOTufvlyzdyzlgJJ1jj1Q+po1H/BTVfAI+lEXqYIftIfsjmkljzVTKmn0abp 9iyDLGS1a6faRO6J06FG5htJ4vaT2xBBpD8dWQnRBFQZZPOSNqwVmMabZrW54O39iTavNxSiAcbXd x3ywYHVIB/dICsLCIfuwVAz+c4uChbNVOlSWP8Kc+PCko8e9TKngZe7xIwoLrfhWyj4vWh7jc3eoc HEs6HoTNVsctDsF0Awew==; 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 1fftMF-0000gs-HQ; Wed, 18 Jul 2018 20:47:35 +0000 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fftMC-0000g4-35 for linux-arm-kernel@lists.infradead.org; Wed, 18 Jul 2018 20:47:33 +0000 Received: by mail-pg1-x544.google.com with SMTP id e6-v6so2533129pgv.2 for ; Wed, 18 Jul 2018 13:47:21 -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=sArlYhHE0ht3rYmY1PBkXgKCIRhIlweZX/pOCKxQkMg=; b=kqbDQ8pf/TdbZsKpeb1aoFucsNa5ZrnA1y9bswUS6kt+Tp56qtwmcAOyJK/S7b9SgT VBvzcO3np1zNWJb/jkw3IUGwjTEQC3SNhAF3Bg/L/gleO6GmDE1QB+et5mQQYtd6Azt5 atlfh/gEdXEskZWh37m3FOHbr5Pnq54ZL4rE/C147b8LX69oW5+XW1ODokEJtN0BRgdf gOPfwXbYA7mDxizcD12etZdT9PMzcgedSQ1f33pzoImu/5yEGN7DHV+hw7cn55kCDWfj DHHNiuzaM0ClXuErqCf15KdRwETx4mmqlKy4g/RKa5sSwU4wyUzWM/pigio8ZKt4bS64 WWOA== 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=sArlYhHE0ht3rYmY1PBkXgKCIRhIlweZX/pOCKxQkMg=; b=rMdb0Nx5hPJ5Lz71NL1/9zwHFlom7EXvVOAcNYiRQEJrt2uBNRl0KnzFuRWsBYg5ef kYIFgf+CYzwONEIv+62z/uq2FCFsPXkIEYjxKvPPuR3btAvQ3mtzjJhDyLLjpncGxqIZ DVFX6GXUtJXi/ndCLJvE1oTq3zA9ApTeLcVzW3lPsJC5f+5GIdkVNCzSMWSMNeq9x+aK z8wx4b+4s8AU9EYHnse89FW83gHXcRJ3t4GuIivSCMLaRTHKKhAL4sv6F0JskrXiYntx vw/eVJhNpktvpi3tH7jGacrETAlCvIqxbKC8iGEGFrttQ9OTExT8P9ZWtcvKfIrGbxJw usDQ== X-Gm-Message-State: AOUpUlFC5qqeILbHzo8Fm9iBJk0g4CZmMOHBzNNDceOyNOXlJjULjwHY ZbV2ZbpR0xr1woRhAW5lAdEd4A== X-Google-Smtp-Source: AAOMgpd7bWVAL21abZTIE4IQnYyIJR39tveel9jBQlS6BLV5uJaV5CBZ9/1Y5zExCvH6otmw+NxABw== X-Received: by 2002:a63:aa44:: with SMTP id x4-v6mr7328392pgo.120.1531946840705; Wed, 18 Jul 2018 13:47:20 -0700 (PDT) Received: from jordon-HP-15-Notebook-PC ([183.82.19.142]) by smtp.gmail.com with ESMTPSA id g10-v6sm5676211pgs.17.2018.07.18.13.47.18 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Jul 2018 13:47:19 -0700 (PDT) Date: Thu, 19 Jul 2018 02:19:57 +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 Subject: [PATCH] gpu/drm/exynos: Convert drm_atomic_helper_suspend/resume() Message-ID: <20180718204957.GA14132@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-20180718_134732_156409_96E5595B X-CRM114-Status: GOOD ( 14.67 ) 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. Signed-off-by: Souptick Joarder Signed-off-by: Ajit Negi --- drivers/gpu/drm/exynos/exynos_drm_drv.c | 32 ++++++++++--------------------- drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 17 ---------------- drivers/gpu/drm/exynos/exynos_drm_fbdev.h | 10 ---------- 3 files changed, 10 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..1996ff7 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c @@ -151,39 +151,27 @@ 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; + int ret = 0; - if (pm_runtime_suspended(dev) || !drm_dev) - return 0; + if (pm_runtime_suspended(dev)) + return ret; - private = drm_dev->dev_private; + ret = drm_mode_config_helper_suspend(drm_dev); - 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 ret; } static int exynos_drm_resume(struct device *dev) { struct drm_device *drm_dev = dev_get_drvdata(dev); - struct exynos_drm_private *private; + int ret = 0; - if (pm_runtime_suspended(dev) || !drm_dev) - return 0; + if (pm_runtime_suspended(dev)) + return ret; - 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); + ret = drm_mode_config_helper_resume(drm_dev); - return 0; + return ret; } #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