From patchwork Mon Nov 20 22:57:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 10067427 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 E26F660375 for ; Mon, 20 Nov 2017 22:57:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D1AFD1FFE4 for ; Mon, 20 Nov 2017 22:57:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C650F21E5A; Mon, 20 Nov 2017 22:57:08 +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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID 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 1974A1FFE4 for ; Mon, 20 Nov 2017 22:57:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9804289DBD; Mon, 20 Nov 2017 22:57:06 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yb0-x230.google.com (mail-yb0-x230.google.com [IPv6:2607:f8b0:4002:c09::230]) by gabe.freedesktop.org (Postfix) with ESMTPS id AC47E89DBD; Mon, 20 Nov 2017 22:57:05 +0000 (UTC) Received: by mail-yb0-x230.google.com with SMTP id w203so3708427ybe.9; Mon, 20 Nov 2017 14:57:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=2CgKHeohzKvmU5CCyky4NtqpTrvgj8hOOqtgetd5iDY=; b=vHDo9GoW08o1uPE25Gjg/5Sb2qBa4qPP+qO0tmeHXv2y8lxWu2eiXDYARvnDyCrNTF 14CXbgWPfGvLYoWwfvwLgvJvAzNsH7wXgbuqa71GwzZ6aVB+3anqnjUYNpBQQj6CjP+4 AC9KbuDQTleFnN/CSnl47LbZwrrw6EF/GEEfT+f0r/qVVzejyPUAKlwac8NH6Sdjsx3y JjFMaPUxBw7dncXxm4WhOP4lzppy559aky2KqCI76SIaXGbZvq2tLQUu8ed5E//ArThS QeW5OAagAP+Ddqs9zrcBti598nY0QgVY6Y0Rb1QMpSl4FSpo1XolhoOmAEJyMsw8QbGK vdwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=2CgKHeohzKvmU5CCyky4NtqpTrvgj8hOOqtgetd5iDY=; b=nRHeKCiUdomXHNM29uOUj04ORIyqsuArdl+C0v+TE0I8lV0riYDL9eZwr/T9e/sCxZ KVY5zYn1DWSh8Z6B4tcvOseJYqIkMZQ3zgunh2CyEk8Xx/a0SXYgP0suK92ePYXcDOm5 /8WYUxTRS7Zwj1QKE1DYPEUU4Qx6w2phsQsOhEQQtf4lPEIFTSjQ414VEVhOI0lNOtPg TV3iSQ4gwxmOyz0YdSQWmyVU7yOycSqErLYET0pIgqAZia2vUNJU215cuxMzfe7AlGjG 4DHpdbanZivEwlVfvF9W2yQSspSLUkI36HdFXERwpNDIjyLHH48hF8IrQKgnsgK3YLEb CCHA== X-Gm-Message-State: AJaThX56F3wKxYQMpSRWr808OaLjpjxtzdB5nscd7gf1hIv2Moh2IGSC n7gu3dQtCL4IoTgEq0skMf/bDjdmlsRsh30QNxY= X-Google-Smtp-Source: AGs4zMahwLVUemOqTwZ6iq2RURoGLNec3wVcKu8zpfcJNqeVrQdo+wbiktB23Y9cOW5HbsKKKjKfisou/rI3O+hzRfE= X-Received: by 10.37.178.146 with SMTP id k18mr9102044ybj.373.1511218623397; Mon, 20 Nov 2017 14:57:03 -0800 (PST) MIME-Version: 1.0 Received: by 10.37.131.209 with HTTP; Mon, 20 Nov 2017 14:57:02 -0800 (PST) In-Reply-To: <322466dc29fe070b9fe79fb8400fac6e@nuetzel-hh.de> References: <42afc09a774d61e68c415c05371fbb3b@nuetzel-hh.de> <3ad0d897c4c5e67207b4097337ff520f@nuetzel-hh.de> <322466dc29fe070b9fe79fb8400fac6e@nuetzel-hh.de> From: Alex Deucher Date: Mon, 20 Nov 2017 17:57:02 -0500 Message-ID: Subject: Re: [amd-staging-drm-next] regression - no fan info (sensors) on RX580 To: =?UTF-8?Q?Dieter_N=C3=BCtzel?= Cc: =?UTF-8?Q?Michel_D=C3=A4nzer?= , "Zhu, Rex" , DRI Devel , amd-devel 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP On Sun, Oct 8, 2017 at 10:31 PM, Dieter Nützel wrote: > OK, got it but can't revert the commit clean. > > amdgpu-pci-0100 > Adapter: PCI adapter > fan1: 873 RPM > temp1: +26.0°C (crit = +0.0°C, hyst = +0.0°C) > > SOURCE/amd-staging-drm-next> git bisect good > 0944c350c8eddf4064e7abb881dd245032fdfa23 is the first bad commit > commit 0944c350c8eddf4064e7abb881dd245032fdfa23 > Author: Rex Zhu > Date: Mon Sep 25 18:51:50 2017 +0800 > > drm/amdgpu: delete pp_enable in adev > > amdgpu not care powerplay or dpm is enabled. > just check ip functions and pp functions > > Change-Id: Iaac75d45170ef9b20e212465f837eaaa798365bd > Reviewed-by: Alex Deucher > Signed-off-by: Rex Zhu > > :040000 040000 72361654709479890586e383ec73088e535a1cf5 > 2b6d5a75ffc3b6fd48c63e79bf28faddcc734918 M drivers I think the attached patch should fix it. Alex > > Greetings, > Dieter > > > > Am 09.10.2017 02:19, schrieb Dieter Nützel: >> >> Sorry Rex, >> >> after return from our vacation, >> I've tested latest amd-staging-drm-next (e5f6a57e350a) >> but it is NOT solved on my RX580. >> I'll try bisecting if I find some more time in the coming days. >> >> amdgpu-pci-0100 >> Adapter: PCI adapter >> temp1: +27.0°C (crit = +0.0°C, hyst = +0.0°C) >> >> 01:00.0 VGA compatible controller: Advanced Micro Devices, Inc. >> [AMD/ATI] Ellesmere [Radeon RX 470/480/570/580] (rev e7) (prog-if 00 >> [VGA controller]) >> Subsystem: Sapphire Technology Limited Radeon RX 570 >> >> [ 36.740] (--) AMDGPU(0): Chipset: "Radeon RX 580 Series" (ChipID = >> 0x67df) >> >> Thanks, >> Dieter >> >> Am 30.09.2017 05:09, schrieb Zhu, Rex: >>> >>> Yes, caused by the commit e37a7b4088da >>> ("drm/amd/powerplay: tidy up ret checks in amd_powerplay.c") >>> >>> Replace error when split patches. >>> >>> Have sent the fix patch. >>> Please review. >>> >>> Best Regards >>> Rex >>> >>> >>> -----Original Message----- >>> From: Alex Deucher [mailto:alexdeucher@gmail.com] >>> Sent: Friday, September 29, 2017 10:11 PM >>> To: Dieter Nützel; Zhu, Rex >>> Cc: amd-devel; DRI Devel; Wentland, Harry; Michel Dänzer >>> Subject: Re: [amd-staging-drm-next] regression - no fan info (sensors) on >>> RX580 >>> >>> Rex, probably related to the recent cleanups in powerplay. >>> >>> On Fri, Sep 29, 2017 at 10:09 AM, Dieter Nützel >>> wrote: >>>> >>>> Hello all, >>>> >>>> since latest update >>>> >>>> 1d7da702e70d3c27408a3bb312c71d6be9f7bebe >>>> drm/amd/powerplay: fix spelling mistake: "dividable" -> "divisible" >>>> >>>> I didn't get fan info with my RX580 (Polaris21) any longer. >>>> >>>> Worked with this commit: >>>> >>>> 786df0b89fe5a0b405d4de0a1ce03003c0743ec3 >>>> drm/amd/display: fix pflip irq registor for raven >>>> >>>> Sorry, I do not have full time for bisect, because we are on way to >>>> our vacation. >>>> >>>> Maybe in the evening (only a few commits). >>>> >>>> Greetings, >>>> Dieter >> >> _______________________________________________ >> dri-devel mailing list >> dri-devel@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/dri-devel > > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx Tested-by: Dieter Nützel From 70d57b480ece67dbb4c54294f5b34549043688ac Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Mon, 20 Nov 2017 17:49:53 -0500 Subject: [PATCH] drm/amdgpu: don't skip attributes when powerplay is enabled The function checks non-powerplay structures so regressed when the pp_enabled check was removed. This should ideally be implemented similarly for powerplay. Fixes: 6d07fe7bcae57 ("drm/amdgpu: delete pp_enable in adev") Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c index 3506758349dc..6f56ff606e43 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c @@ -945,6 +945,10 @@ static umode_t hwmon_attributes_visible(struct kobject *kobj, struct amdgpu_device *adev = dev_get_drvdata(dev); umode_t effective_mode = attr->mode; + /* no skipping for powerplay */ + if (adev->powerplay.cgs_device) + return effective_mode; + /* Skip limit attributes if DPM is not enabled */ if (!adev->pm.dpm_enabled && (attr == &sensor_dev_attr_temp1_crit.dev_attr.attr || -- 2.13.6