Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3085594ybt; Mon, 29 Jun 2020 15:00:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzHL3s2NQ+qvU5RYDd9eDJQ1X8ofCvIE597jJXiMOY2H9PTAb0xGiulnWCau2QMSGqe81qk X-Received: by 2002:a17:906:2b54:: with SMTP id b20mr15739760ejg.366.1593468004292; Mon, 29 Jun 2020 15:00:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593468004; cv=none; d=google.com; s=arc-20160816; b=HIzFdCOobwtmBAeekaywoxGXT6+S4ClrDTVKlOwHJQuleCk1nPkjBBbIyZlNA+cKO2 bogmx8NTyPqR9kfYG989CaAO16yh9pD0aRmItgK58Lp036wlJ9pyELGFchaTEFY7zNDp TXpUXYyPi9zzO/aB71i9gpT3g8TU+UzBjlVedpGJS4x0pQMrx80q/cbuN9bk4LWqrUxO uHAA5bZg9qceVU3JLhpRusOwwoNeUx2jc8y4Ul+I8SRBfjtnABD27XebBaClhbTjvvq+ mL/f/ncZ/b14ylN4+bWhKllnQ00cDQRXIfgu9Cu8DCo/d4zIRyGdLk6EUfp8N6PueQnm gFPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=zahUj9dMlspRirAaAhssqD5dLFErMqfsAjOpSyPwF94=; b=nO2+6V0OH6wq/qL4GXFCw9BIQlXUzS0YR0VeOz+LjcV3O9+Qz4hXq496VLS0uDdKQ+ qOFTsXZ/YdlcZz0uMaLlvQz9n/amNk9QHxF77vAgfSXcK3Ir0kwWhkDT7mGzJRK3vZEe 3spuG46in3SmuG4LfVUpEHkwYI6MhChwVVGslsULx9aFkI4ADTiZby7G+exTSabSW8cd xZ5Ac7SDEAOe9CvkpQNaYHac1NUg3i67YQg3hT7AJDPhoDWm4czP0jjS6PSjSKpp2C6h 9Hq2GJXAov1igEI/tXfuGhQsPl4ThrCTTJQdpkHcKwYB9ZlCq8jXUj5JN2wBAsppbvdk /vHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ucJIYhq9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y6si507033ejr.560.2020.06.29.14.59.41; Mon, 29 Jun 2020 15:00:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ucJIYhq9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391634AbgF2V6O (ORCPT + 99 others); Mon, 29 Jun 2020 17:58:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:56910 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726468AbgF2Sf2 (ORCPT ); Mon, 29 Jun 2020 14:35:28 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 73DD9247D3; Mon, 29 Jun 2020 15:22:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593444141; bh=9eTJkBPtQzWZrbi1EuMCFB1y10kAK0/xqrmC+Tcg7u8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ucJIYhq9S1FDv/8xh8z19L7xkm9XqRP0rXrUMLFaRciJn+fRp8s7g0Xfprapw+7NW k+KkL35IYhakt/4ipJhT7vXiyfwCc8G4ErpTP111C4YQgHXm4EjLdP5gkB26d9H830 1ttooSkLsoH37t9sA+RR7fOHpll7Bokt1bFb6t5A= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Denis Efremov , Alex Deucher , Greg Kroah-Hartman Subject: [PATCH 5.7 247/265] drm/radeon: fix fb_div check in ni_init_smc_spll_table() Date: Mon, 29 Jun 2020 11:18:00 -0400 Message-Id: <20200629151818.2493727-248-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629151818.2493727-1-sashal@kernel.org> References: <20200629151818.2493727-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.7.7-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.7.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.7.7-rc1 X-KernelTest-Deadline: 2020-07-01T15:14+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Denis Efremov commit 35f760b44b1b9cb16a306bdcc7220fbbf78c4789 upstream. clk_s is checked twice in a row in ni_init_smc_spll_table(). fb_div should be checked instead. Fixes: 69e0b57a91ad ("drm/radeon/kms: add dpm support for cayman (v5)") Cc: stable@vger.kernel.org Signed-off-by: Denis Efremov Signed-off-by: Alex Deucher Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/radeon/ni_dpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/ni_dpm.c b/drivers/gpu/drm/radeon/ni_dpm.c index b57c37ddd164c..c7fbb7932f379 100644 --- a/drivers/gpu/drm/radeon/ni_dpm.c +++ b/drivers/gpu/drm/radeon/ni_dpm.c @@ -2127,7 +2127,7 @@ static int ni_init_smc_spll_table(struct radeon_device *rdev) if (clk_s & ~(SMC_NISLANDS_SPLL_DIV_TABLE_CLKS_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_CLKS_SHIFT)) ret = -EINVAL; - if (clk_s & ~(SMC_NISLANDS_SPLL_DIV_TABLE_CLKS_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_CLKS_SHIFT)) + if (fb_div & ~(SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_SHIFT)) ret = -EINVAL; if (clk_v & ~(SMC_NISLANDS_SPLL_DIV_TABLE_CLKV_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_CLKV_SHIFT)) -- 2.25.1