From patchwork Tue Jun 23 19:51:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 223054 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=-10.0 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 D3129C433E0 for ; Tue, 23 Jun 2020 21:42:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A56262078E for ; Tue, 23 Jun 2020 21:42:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592948569; bh=8/pXT+CdqlF/Ij3YUpTLBMYKt/T67s2YJK6t2h09dJU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xg3bh/QP/wMDusQgTceCgfZXyj0mkfxl3I0EMXHYd27xeRSwgpIPCldI0OQv6lMZR QProHXJmNfkemaWEaPSbwqSVwW9JBJO0+3nR5RZPndjkJwZ3YtkAZN9+a4w8FOolhY UkW62A7fEYbVsm+kOdJH4990dexkPo54DGAU9OAI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388217AbgFWUEb (ORCPT ); Tue, 23 Jun 2020 16:04:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:43090 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387699AbgFWUEb (ORCPT ); Tue, 23 Jun 2020 16:04:31 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 293BE2082F; Tue, 23 Jun 2020 20:04:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592942670; bh=8/pXT+CdqlF/Ij3YUpTLBMYKt/T67s2YJK6t2h09dJU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V6ppAVP/plVcwN5hBKwxYn5OwjydHhUNVsAly6+Rj9ivStJPec4E/gADVh2tIO9io 21LumUegd1EnzJ4Phfe0BD7LmHcxaGY5XCvdGCduD2MIow3zhAcPt+GldOswDH5Xl3 DRteKtEc/V+zEKwASBfUyz9bWa2m56pHp4ywaAdE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Thierry Reding , Emil Velikov , Ben Skeggs , Sasha Levin Subject: [PATCH 5.7 089/477] drm/nouveau: gr/gk20a: Use firmware version 0 Date: Tue, 23 Jun 2020 21:51:26 +0200 Message-Id: <20200623195411.812334847@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Thierry Reding [ Upstream commit 21454fe697fde188ad6fb541f94b9838fa73ab38 ] Tegra firmware doesn't actually use any version numbers and passing -1 causes the existing firmware binaries not to be found. Use version 0 to find the correct files. Fixes: ef16dc278ec2 ("drm/nouveau/gr/gf100-: select implementation based on available FW") Signed-off-by: Thierry Reding Reviewed-by: Emil Velikov Signed-off-by: Ben Skeggs Signed-off-by: Sasha Levin --- drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c index 4209b24a46d70..bf6b65257852f 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c @@ -341,7 +341,7 @@ gk20a_gr_load(struct gf100_gr *gr, int ver, const struct gf100_gr_fwif *fwif) static const struct gf100_gr_fwif gk20a_gr_fwif[] = { - { -1, gk20a_gr_load, &gk20a_gr }, + { 0, gk20a_gr_load, &gk20a_gr }, {} };