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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 89000C43381 for ; Mon, 18 Feb 2019 14:39:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 503A521736 for ; Mon, 18 Feb 2019 14:39:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550500791; bh=QuaG1rJwN7BNIg0TWBYl2lrq73KFNyETH7GEQ2e4QWk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Fk5xUJJepqrFKtXo4lACnSvLgzQjF806HTdWv/ns7HLnA/xbPKXRpPNg4nLr45/J9 sLvQ663ivq++xfItq1X+SNQwITobZfun0I/Eq2t0n1JJPqrpK08xXmWa2B11YyWMGX P2zkwWiHEnQP0zPd+eAWLzsyqWHFrRpypm9NZG7I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732756AbfBRNwl (ORCPT ); Mon, 18 Feb 2019 08:52:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:60404 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732719AbfBRNwa (ORCPT ); Mon, 18 Feb 2019 08:52:30 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CEC5E21906; Mon, 18 Feb 2019 13:52:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550497950; bh=QuaG1rJwN7BNIg0TWBYl2lrq73KFNyETH7GEQ2e4QWk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hOcazwqWmYZWdxYYI1jKMXK+Jy/rzjr1exvnhUZzrehhyb8n4IwcxgAVsObR+3W1x dF5uP3qaKSSFdj2arwVuqK6jdXz0RHcc5ivDI8/AcojhssjUR79Wjtdzrbpkc4jm/K AMWfZvSxzSazBJEKEWcfhgXagLZk7a829Mxcqd48= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Thomas Blume , Takashi Iwai , Martin Peres , Ben Skeggs , Sasha Levin Subject: [PATCH 4.19 45/85] drm/nouveau: Dont disable polling in fallback mode Date: Mon, 18 Feb 2019 14:43:11 +0100 Message-Id: <20190218133504.522492913@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190218133459.758004711@linuxfoundation.org> References: <20190218133459.758004711@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 118780066e30c34de3d9349710b51780bfa0ba83 ] When a fan is controlled via linear fallback without cstate, we shouldn't stop polling. Otherwise it won't be adjusted again and keeps running at an initial crazy pace. Fixes: 800efb4c2857 ("drm/nouveau/drm/therm/fan: add a fallback if no fan control is specified in the vbios") Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=1103356 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107447 Reported-by: Thomas Blume Signed-off-by: Takashi Iwai Reviewed-by: Martin Peres Signed-off-by: Ben Skeggs Signed-off-by: Sasha Levin --- drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c index 3695cde669f8..07914e36939e 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c @@ -132,11 +132,12 @@ nvkm_therm_update(struct nvkm_therm *therm, int mode) duty = nvkm_therm_update_linear(therm); break; case NVBIOS_THERM_FAN_OTHER: - if (therm->cstate) + if (therm->cstate) { duty = therm->cstate; - else + poll = false; + } else { duty = nvkm_therm_update_linear_fallback(therm); - poll = false; + } break; } immd = false; -- 2.19.1