From patchwork Fri Feb 19 23:17:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 8364981 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3E23FC0554 for ; Fri, 19 Feb 2016 23:17:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 64F2020529 for ; Fri, 19 Feb 2016 23:17:24 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 780E82052A for ; Fri, 19 Feb 2016 23:17:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9C2936F07A; Fri, 19 Feb 2016 23:17:19 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qg0-x236.google.com (mail-qg0-x236.google.com [IPv6:2607:f8b0:400d:c04::236]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5B68F6F075 for ; Fri, 19 Feb 2016 23:17:15 +0000 (UTC) Received: by mail-qg0-x236.google.com with SMTP id b35so73668588qge.0 for ; Fri, 19 Feb 2016 15:17:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6qwtSAFoQOqg0LfKdFwNbb4PXabTxJMY7Ae0ua5ngyI=; b=n9bd+m0mNnP6cYbbhZ7JBsW/V1gESylAZhBtdALSV3f/D7aRBokgB09S8tQaTKdIVG WOyW7GwFJVCrCZ83vHevuxQy7RxcaHfxt/OV2PDWKejFSWgqUpDpz9MkYzJ3iXp08NLf mEzHao05GgQh/23PfJ+NzbGvJLzTv9wB3lz88RiTdfqS1+NjJ8Sl8+7vU4h2VdFwwe8s RHLzjI/h8Xwaix5HAOLSr6/xcLG0iNJcC6zQ5++dNRURFUyQeVk3OsIfh8rUvy94hhyl Y5OkjPs5w4lp8gdcPILZClGDKeoQFjbJDOeUdMUnCjGukuCmaR13FAO0eBsX0L0qtY0R QayA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6qwtSAFoQOqg0LfKdFwNbb4PXabTxJMY7Ae0ua5ngyI=; b=OYUiu9rqPSqaOjpOVmMrOjACjYv/JFnBdfZaaCJh5meC9aVokqFyvA7XzL8VfbZjt0 HCQivBHSti1dNc6eROPrt5WMiDw7gkFV8cx08i8gtqTVAoeAYFO9FoK1NMy0ldq6+h9f 0tEFhJsf6b/j+j3FHVhOG0vv6eDpT6c2V5s945LLzjNSMPajeVlnbynTjTm0nllka0Qr Tf4ahJJko0NRSef6paheDwEFWTjKFBYRrOPS6AN/rNK5mg1sUjhYZ3Jk2X9Ad165nZKa HuNfNiYaUkGalODZwzjay6UHKL18KTK5rxhczAKjQUJTS/mEwYdQBxwSBJWO5MnBVlbB W9gg== X-Gm-Message-State: AG10YORQyvDtXQt/jjwDDbCU1H6m92mtkPJD5NIhO8pZlH5h5Yx+RfAwwv2mePssaMBU8A== X-Received: by 10.140.180.130 with SMTP id b124mr20635988qha.77.1455923834709; Fri, 19 Feb 2016 15:17:14 -0800 (PST) Received: from cm.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by smtp.gmail.com with ESMTPSA id r21sm5623539qkl.21.2016.02.19.15.17.13 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 19 Feb 2016 15:17:14 -0800 (PST) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH 3/5] drm/amdgpu/pm: add some checks for PX Date: Fri, 19 Feb 2016 18:17:03 -0500 Message-Id: <1455923825-28464-3-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1455923825-28464-1-git-send-email-alexander.deucher@amd.com> References: <1455923825-28464-1-git-send-email-alexander.deucher@amd.com> Cc: Alex Deucher 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=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable 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 I.e., doesn't make sense to change power states or check the temperature when the asic is powered off. Acked-by: Harry Wentland Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c index 5ed5598..8de765d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c @@ -113,6 +113,10 @@ static ssize_t amdgpu_get_dpm_forced_performance_level(struct device *dev, struct drm_device *ddev = dev_get_drvdata(dev); struct amdgpu_device *adev = ddev->dev_private; + if ((adev->flags & AMD_IS_PX) && + (ddev->switch_power_state != DRM_SWITCH_POWER_ON)) + return snprintf(buf, PAGE_SIZE, "off\n"); + if (adev->pp_enabled) { enum amd_dpm_forced_level level; @@ -140,6 +144,11 @@ static ssize_t amdgpu_set_dpm_forced_performance_level(struct device *dev, enum amdgpu_dpm_forced_level level; int ret = 0; + /* Can't force performance level when the card is off */ + if ((adev->flags & AMD_IS_PX) && + (ddev->switch_power_state != DRM_SWITCH_POWER_ON)) + return -EINVAL; + if (strncmp("low", buf, strlen("low")) == 0) { level = AMDGPU_DPM_FORCED_LEVEL_LOW; } else if (strncmp("high", buf, strlen("high")) == 0) { @@ -181,8 +190,14 @@ static ssize_t amdgpu_hwmon_show_temp(struct device *dev, char *buf) { struct amdgpu_device *adev = dev_get_drvdata(dev); + struct drm_device *ddev = adev->ddev; int temp; + /* Can't get temperature when the card is off */ + if ((adev->flags & AMD_IS_PX) && + (ddev->switch_power_state != DRM_SWITCH_POWER_ON)) + return -EINVAL; + if (!adev->pp_enabled && !adev->pm.funcs->get_temperature) temp = 0; else @@ -846,12 +861,16 @@ static int amdgpu_debugfs_pm_info(struct seq_file *m, void *data) struct drm_info_node *node = (struct drm_info_node *) m->private; struct drm_device *dev = node->minor->dev; struct amdgpu_device *adev = dev->dev_private; + struct drm_device *ddev = adev->ddev; if (!adev->pm.dpm_enabled) { seq_printf(m, "dpm not enabled\n"); return 0; } - if (adev->pp_enabled) { + if ((adev->flags & AMD_IS_PX) && + (ddev->switch_power_state != DRM_SWITCH_POWER_ON)) { + seq_printf(m, "PX asic powered off\n"); + } else if (adev->pp_enabled) { amdgpu_dpm_debugfs_print_current_performance_level(adev, m); } else { mutex_lock(&adev->pm.mutex);