From patchwork Fri Aug 16 12:57:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Pali_Roh=C3=A1r?= X-Patchwork-Id: 2846192 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 716419F271 for ; Sun, 18 Aug 2013 15:47:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B016E20268 for ; Sun, 18 Aug 2013 15:47:36 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id D9EEA20263 for ; Sun, 18 Aug 2013 15:47:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CD8A5E6978 for ; Sun, 18 Aug 2013 08:47:35 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ea0-f177.google.com (mail-ea0-f177.google.com [209.85.215.177]) by gabe.freedesktop.org (Postfix) with ESMTP id E3817E6838 for ; Fri, 16 Aug 2013 05:58:01 -0700 (PDT) Received: by mail-ea0-f177.google.com with SMTP id f15so981462eak.22 for ; Fri, 16 Aug 2013 05:58:01 -0700 (PDT) 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 :mime-version:content-type:content-transfer-encoding; bh=OP7hF7jJkS89bMOAmhKOMjRKMys1GafKdVbAUpzM1hI=; b=gcA4FUDaj1YvmdDpR6vit5OfBZ61J53r7w49JJzeIvYvUbRAcuF2Vx9PDpRkz+tJWY yRho19PqBK7E8bA3uR7UcT3O/uXbNul9kyCiBr1DICBE92yUMzCE7AxImpQIYVFU4qUT 078uN/UHCXf+6hRYM9HVIKxcBZh5J2AUizOg7pXggV4h+2Lx/vHoYuscUnQidAe45akt 68biWsa/KxJujLiRqQu1DugX76hr7Fg9ZScZUVmjc9rLSwelXlnwFFMA9qZ6vyd4Z62S RBF1guvYOLWEKxyOiKuSdQueVP1dQSAp/YWMN0a9AqCqkAOG6xTUfS5xcZdUuREXLhx/ OK6w== X-Received: by 10.14.6.9 with SMTP id 9mr3408eem.108.1376657881213; Fri, 16 Aug 2013 05:58:01 -0700 (PDT) Received: from localhost.localdomain (ip-88-212-34-237.antik.sk. [88.212.34.237]) by mx.google.com with ESMTPSA id z12sm2531814eev.6.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 16 Aug 2013 05:58:00 -0700 (PDT) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Ben Skeggs , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, David Airlie Subject: [PATCH] nouveau: fix reclocking on nv40 Date: Fri, 16 Aug 2013 14:57:07 +0200 Message-Id: <1376657827-8105-1-git-send-email-pali.rohar@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <520DFD9F.1070006@labri.fr> References: <520DFD9F.1070006@labri.fr> MIME-Version: 1.0 X-Mailman-Approved-At: Sun, 18 Aug 2013 08:43:28 -0700 Cc: Martin Peres , =?UTF-8?q?Pali=20Roh=C3=A1r?= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-6.9 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 In commit 77145f1cbdf8d28b46ff8070ca749bad821e0774 was introduced error which cause that reclocking on nv40 not working anymore. There is missing assigment of return value from pll_calc to ret. Signed-off-by: Pali Rohár Signed-off-by: Martin Peres --- drivers/gpu/drm/nouveau/nv40_pm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nv40_pm.c b/drivers/gpu/drm/nouveau/nv40_pm.c index 3af5bcd..625f80d 100644 --- a/drivers/gpu/drm/nouveau/nv40_pm.c +++ b/drivers/gpu/drm/nouveau/nv40_pm.c @@ -131,7 +131,7 @@ nv40_calc_pll(struct drm_device *dev, u32 reg, struct nvbios_pll *pll, if (clk < pll->vco1.max_freq) pll->vco2.max_freq = 0; - pclk->pll_calc(pclk, pll, clk, &coef); + ret = pclk->pll_calc(pclk, pll, clk, &coef); if (ret == 0) return -ERANGE;