From patchwork Thu Apr 2 15:30:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Stach X-Patchwork-Id: 6150111 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 1D2029F1BE for ; Thu, 2 Apr 2015 15:32:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 35F09203AA for ; Thu, 2 Apr 2015 15:32:45 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 6D1E6203AC for ; Thu, 2 Apr 2015 15:32:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A770A6EA6C; Thu, 2 Apr 2015 08:31:21 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [92.198.50.35]) by gabe.freedesktop.org (Postfix) with ESMTP id 93E906EA6A for ; Thu, 2 Apr 2015 08:31:00 -0700 (PDT) Received: from dude.hi.4.pengutronix.de ([10.1.0.7] helo=dude.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1Ydh59-0005OD-TK; Thu, 02 Apr 2015 17:30:59 +0200 From: Lucas Stach To: dri-devel@lists.freedesktop.org Subject: [PATCH RFC 078/111] staging: etnaviv: remove powerrail support Date: Thu, 2 Apr 2015 17:30:20 +0200 Message-Id: <1427988653-754-79-git-send-email-l.stach@pengutronix.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1427988653-754-1-git-send-email-l.stach@pengutronix.de> References: <1427988653-754-1-git-send-email-l.stach@pengutronix.de> X-SA-Exim-Connect-IP: 10.1.0.7 X-SA-Exim-Mail-From: l.stach@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: dri-devel@lists.freedesktop.org Cc: Russell King , kernel@pengutronix.de 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=-3.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, TVD_SUBJ_WIPE_DEBT, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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: Russell King Remove the etnaviv specific power rail support, which is mostly disabled anyway. This really wants to be using the power domain support instead, which allows the SoC specifics to be abstracted from the driver, rather than a home-cooked version of it. For example, on Dove, it is necessary to go through a specific isolation and reset sequence when removing and restoring the power to the GPU, which is something we don't want to have to place into the generic GPU driver. Signed-off-by: Russell King --- drivers/staging/etnaviv/etnaviv_gpu.c | 47 ----------------------------------- 1 file changed, 47 deletions(-) diff --git a/drivers/staging/etnaviv/etnaviv_gpu.c b/drivers/staging/etnaviv/etnaviv_gpu.c index ffecce5236f9..7537ab13a47e 100644 --- a/drivers/staging/etnaviv/etnaviv_gpu.c +++ b/drivers/staging/etnaviv/etnaviv_gpu.c @@ -607,45 +607,6 @@ void etnaviv_gpu_debugfs(struct etnaviv_gpu *gpu, struct seq_file *m) /* * Power Management: */ - -static int enable_pwrrail(struct etnaviv_gpu *gpu) -{ -#if 0 - struct drm_device *dev = gpu->drm; - int ret = 0; - - if (gpu->gpu_reg) { - ret = regulator_enable(gpu->gpu_reg); - if (ret) { - dev_err(dev->dev, "failed to enable 'gpu_reg': %d\n", - ret); - return ret; - } - } - - if (gpu->gpu_cx) { - ret = regulator_enable(gpu->gpu_cx); - if (ret) { - dev_err(dev->dev, "failed to enable 'gpu_cx': %d\n", - ret); - return ret; - } - } -#endif - return 0; -} - -static int disable_pwrrail(struct etnaviv_gpu *gpu) -{ -#if 0 - if (gpu->gpu_cx) - regulator_disable(gpu->gpu_cx); - if (gpu->gpu_reg) - regulator_disable(gpu->gpu_reg); -#endif - return 0; -} - static int enable_clk(struct etnaviv_gpu *gpu) { if (gpu->clk_core) @@ -688,10 +649,6 @@ int etnaviv_gpu_pm_resume(struct etnaviv_gpu *gpu) DBG("%s", dev_name(gpu->dev)); - ret = enable_pwrrail(gpu); - if (ret) - return ret; - ret = enable_clk(gpu); if (ret) return ret; @@ -717,10 +674,6 @@ int etnaviv_gpu_pm_suspend(struct etnaviv_gpu *gpu) if (ret) return ret; - ret = disable_pwrrail(gpu); - if (ret) - return ret; - return 0; }