From patchwork Fri Aug 11 16:05:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 134627 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp1259707vqi; Fri, 11 Aug 2023 10:52:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG+u6PyQ0UlJQmSQbk0D3qTKn5jsdT0m+8BWCx2uHoUPzFIZ1fTsj6hLlu8/RsgNup7tgOD X-Received: by 2002:a17:90a:9e7:b0:268:52a6:103d with SMTP id 94-20020a17090a09e700b0026852a6103dmr2230683pjo.9.1691776342922; Fri, 11 Aug 2023 10:52:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691776342; cv=none; d=google.com; s=arc-20160816; b=y8U7XDVvfWclCwFDtR1ErkkJBbXMtbYYOgKCwWmD1CR0ENuckn16FT49gbhk85pnUV lUk7isSrTsZz3w3+zl2hPsd4JBfrPUhOqYpKZp8fAXdRhWBXmsPyDPY3MoZJzY+GcQag jIQwM0hXIsxeOLEGp5NQvsBJ37pk2nprLzLBsj81HeltL+BPqz9FhylICatt6+m4mbDq YP4MW/XA55EGKsVLeA7vH0RcRzYC/MAR/6H+RDdo2sO/PbJUx0oY3YmYpzG7xcVnqOhp FiMaS7iN3Zwu+jOKiRujmY29QtNyPkM4BmRXbfT2SxLH1a0zHAeCX6sCDoGCJjzze5OD 4blg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=AZRMmH5v/BxY4ax8oeXvl1jWy77Sd8S2/awGfYcHbs8=; fh=fOzqd2B1+9Unm5UpvjAOy4xptYdpXnbwtmI8hkFeZwI=; b=zVAJFPZO4epWrnghTqjxUEU+pd57hyEL9SG4zpbKhTVDaczZ7Q71m7KNVtQyH9MTpI UcBgyyaJjdHrBwH0OyC44YQl6RDpH+xPC8jnAFmMh5FwPKpReB30yUIOmKD0MdQWaHHs /DY7JPU1uzSS4jBN52MiN/dd588+Pjkb74vCF/JirZqwBdN36cxtQk8kvp01cUc/8ARc PL+wRMFpLGgAa4jZT8NXUt5Gg4wz2Vcjrlhs5PhW128pqJjxbtQe7pjFhIHbcxdcL1JL U0T09WS1L0Fk6ZZuXVEsWTdHoRm584BL4HG9PTJUsWN3nEI29poMM0othQ/MtPnmitM3 1kNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=GJDMPCHF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k15-20020a170902c40f00b001b8904eadb8si3797217plk.460.2023.08.11.10.52.07; Fri, 11 Aug 2023 10:52:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=GJDMPCHF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235495AbjHKQFO (ORCPT + 99 others); Fri, 11 Aug 2023 12:05:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234001AbjHKQFN (ORCPT ); Fri, 11 Aug 2023 12:05:13 -0400 Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0501C10DE; Fri, 11 Aug 2023 09:05:12 -0700 (PDT) Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-1bc3d94d40fso18907155ad.3; Fri, 11 Aug 2023 09:05:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691769911; x=1692374711; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=AZRMmH5v/BxY4ax8oeXvl1jWy77Sd8S2/awGfYcHbs8=; b=GJDMPCHFPULCocVk+R3xk7keeGDRvu06pOGCvVMjSbu8Kw9nnq63erYCOvZFYAWPlD WNg42PS21/FFwxvdwKtbv5GOf6PXH7K5PS7FyenLew/86kHLK4M28fvXYhzwJJpdHFMn S5pvK5VnHIv+96UI2jf8lVuyerbdY5LORdZy+VYqORYkQGJZrHt7thOwwMZWHB+MOmk3 7kwAW8abFxjMm5qgmiqJmt4YnjHBWUdnYlg8Fdh1tDYIyBZtlRD+CU3mzkg5WGkbwoXC 9UrH66Da4SlXXwXWOiLAMq+01u34d+mTOWYV97gy+iFWmn9wl8TFyy+BSzY7MIttRAP/ KGsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691769911; x=1692374711; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=AZRMmH5v/BxY4ax8oeXvl1jWy77Sd8S2/awGfYcHbs8=; b=llSfY3Bqpon78w1CFRbzb37Zvk5UuDGSVzn4MbXsYr/P9S4yzS6IjyuuCusXWuhPZl /tOdO7NGcRnqMJAa20F2XSlMQP+a2TpO+l4bmQyhsvGc7BODLlPvoPZlfX9P/2rEBGrU 7JpoYTECrs+JuHT+5kh2iTBSxjbBvS5SJs9Hz2lUZyLsI2+y3drp1B9HZUdzsZ9phg3+ thXc2WbQnH8Y3aS4uHdLv6JQJYWM48FPpeBgd2OhJpfLkoPGnrAl9bNCRrgYd9Y7nLvP xdCut64Mii0yrtcbjfQeugasjTf98lhHlsraCHPcbZvMdC7CVVsMB0qpo725ONbAzBEz OYmA== X-Gm-Message-State: AOJu0Yyo4dKhDMM5Jmd5YertIgLo/wVzPW8e3W88fuQqStHsuDMyaFZq 2UqZuM8gnkSSQ0Tok1dmUes= X-Received: by 2002:a17:902:ecc6:b0:1b8:1335:b775 with SMTP id a6-20020a170902ecc600b001b81335b775mr3280309plh.0.1691769911361; Fri, 11 Aug 2023 09:05:11 -0700 (PDT) Received: from localhost ([2a00:79e1:abd:4a00:6c80:7c10:75a0:44f4]) by smtp.gmail.com with ESMTPSA id iw12-20020a170903044c00b001bb9d6b1baasm4089085plb.198.2023.08.11.09.05.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Aug 2023 09:05:10 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, Rob Clark , Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , David Airlie , Daniel Vetter , Konrad Dybcio , Johan Hovold , Bjorn Andersson , linux-kernel@vger.kernel.org (open list) Subject: [PATCH] drm/msm/a690: Switch to a660_gmu.bin Date: Fri, 11 Aug 2023 09:05:03 -0700 Message-ID: <20230811160505.174574-1-robdclark@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773951228068335944 X-GMAIL-MSGID: 1773956070380464092 From: Rob Clark There isn't actually a a690_gmu.bin. But it appears that the normal a660_gmu.bin works fine. Normally all the devices within a sub- generation (or "family") will use the same fw, and a690 is in the a660 family. Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/adreno/adreno_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c index 1ed270dae148..756a9cfe1cbf 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_device.c +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c @@ -478,7 +478,7 @@ static const struct adreno_info gpulist[] = { .family = ADRENO_6XX_GEN4, .fw = { [ADRENO_FW_SQE] = "a660_sqe.fw", - [ADRENO_FW_GMU] = "a690_gmu.bin", + [ADRENO_FW_GMU] = "a660_gmu.bin", }, .gmem = SZ_4M, .inactive_period = DRM_MSM_INACTIVE_PERIOD,