From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.3 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 02B71C433E2 for ; Fri, 28 Aug 2020 17:59:09 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D17E120776 for ; Fri, 28 Aug 2020 17:59:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Dxk9x8k0" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D17E120776 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=amd-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A4CB66E50B; Fri, 28 Aug 2020 17:59:08 +0000 (UTC) Received: from mail-qt1-x841.google.com (mail-qt1-x841.google.com [IPv6:2607:f8b0:4864:20::841]) by gabe.freedesktop.org (Postfix) with ESMTPS id C38856E50B for ; Fri, 28 Aug 2020 17:59:07 +0000 (UTC) Received: by mail-qt1-x841.google.com with SMTP id e5so131859qth.5 for ; Fri, 28 Aug 2020 10:59:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+rcpq3vISB0mcBXQcVUEBRisdMti5kSKa3Oegu0PSfA=; b=Dxk9x8k0jJHmloO4jVH+f734Vi6V3dYLntErh8nL/icyFTAm0Qz+mTW1tB9NJQtCmx 0VEbzAvE0ZGNRIjm+EfIHj13S79IlUqtKnmDu5DpTApZ63UmTAng3k9br/RwmJkCzXRL /iU3PGvUsSIDolQP3OW34jf+MrlAYOaQVgoTqAzohyDSooHxN9DnRnYhabgY2qB+pfIP zZd2+70WMUM5AhMtwGEOeiPfx6A3PTGWi6jlDRvTLKX/XOty64iMlQvskoK9nj4kYVLj yRBv5I25MW2wybBH3L7jvl4H6ujPcCNFoz8P2DT91JdXLPsBfvqxBzw+AaYUPoh6iAGg 5+cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+rcpq3vISB0mcBXQcVUEBRisdMti5kSKa3Oegu0PSfA=; b=AdKjFKA71izhwMxgNq8n5meAOXRHGlWI+4Cm7EL1Yq/07XOF3uNSnY5bLy+L4I5zmA FhoULzdS6/xxjUct7qTc06uwfGKJrqzG9yL7xZtFbJXyJj9NstU8YhcJ6ViRwVTRgqUX mlsKW4K7NWT47NIpWjtEVyqENL+Hbd4/ylGGLdbu0bltCEc5MCLpTMvqMkutYpTfupZO vfUvLQbnRZbKcSz238/tBJCYzjOpLaXjhQHENE4uGptpuChyznUz0XT1tkb3f7uk5gOn dFhgX1LWA/9rTZEUVlxgviH016UOFi06mQRiRhQ2NSXekMl1VVDQXv1UjaBVy/DHmP/+ Azkw== X-Gm-Message-State: AOAM533DzG6b6V09dorCYUo1Lut7fentJjducf6l3x8OXYdnUAmcGXEg Ks3tq9WCJfKOeqWYy0ls79Il+kKFA0E= X-Google-Smtp-Source: ABdhPJy4CAUO6tRymEnbrF7enqgmyemBDAztxpkHxnXepL2/eNe4niChkEV0K9gt4aRzirEKAimC+w== X-Received: by 2002:ac8:4643:: with SMTP id f3mr2703579qto.128.1598637546799; Fri, 28 Aug 2020 10:59:06 -0700 (PDT) Received: from tr4.amd.com (atlvpn.amd.com. [165.204.84.11]) by smtp.gmail.com with ESMTPSA id x28sm1278129qki.55.2020.08.28.10.59.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Aug 2020 10:59:06 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: amd-gfx@lists.freedesktop.org Subject: [PATCH 5/6] drm/amdgpu/swsmu: add smu11 helper to get manual fan speed (v2) Date: Fri, 28 Aug 2020 13:58:52 -0400 Message-Id: <20200828175853.2378523-5-alexander.deucher@amd.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200828175853.2378523-1-alexander.deucher@amd.com> References: <20200828175853.2378523-1-alexander.deucher@amd.com> MIME-Version: 1.0 X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alex Deucher Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" Will be used to fetch the fan speeds when manual fan mode is set. v2: squash in a Coverity fix from Colin Ian King Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 3 +++ .../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 21 +++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/drivers/gpu/drm/amd/pm/inc/smu_v11_0.h b/drivers/gpu/drm/amd/pm/inc/smu_v11_0.h index 8307e2b790da..1f9575a4dfe7 100644 --- a/drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +++ b/drivers/gpu/drm/amd/pm/inc/smu_v11_0.h @@ -203,6 +203,9 @@ smu_v11_0_set_fan_control_mode(struct smu_context *smu, int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu, uint32_t speed); +int smu_v11_0_get_fan_speed_rpm(struct smu_context *smu, + uint32_t *speed); + int smu_v11_0_set_xgmi_pstate(struct smu_context *smu, uint32_t pstate); diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c index 5abc06f7c9f3..f5aeb0b5cf97 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c @@ -1153,6 +1153,27 @@ int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu, return ret; } +int smu_v11_0_get_fan_speed_rpm(struct smu_context *smu, + uint32_t *speed) +{ + struct amdgpu_device *adev = smu->adev; + uint32_t tach_period, crystal_clock_freq; + uint64_t tmp64; + + tach_period = REG_GET_FIELD(RREG32_SOC15(THM, 0, mmCG_TACH_CTRL), + CG_TACH_CTRL, TARGET_PERIOD); + if (!tach_period) + return -EINVAL; + + crystal_clock_freq = amdgpu_asic_get_xclk(adev); + + tmp64 = (uint64_t)crystal_clock_freq * 60 * 10000; + do_div(tmp64, (tach_period * 8)); + *speed = (uint32_t)tmp64; + + return 0; +} + int smu_v11_0_set_xgmi_pstate(struct smu_context *smu, uint32_t pstate) { -- 2.25.4 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx