From patchwork Fri Jun 16 12:28:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 13282739 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E59CDEB64D7 for ; Fri, 16 Jun 2023 12:28:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232025AbjFPM2Y (ORCPT ); Fri, 16 Jun 2023 08:28:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35302 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344874AbjFPM2W (ORCPT ); Fri, 16 Jun 2023 08:28:22 -0400 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3788430E0 for ; Fri, 16 Jun 2023 05:28:20 -0700 (PDT) Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 08F6E3F84B for ; Fri, 16 Jun 2023 12:28:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1686918499; bh=7aIuaUbJc/mQS9T0aBfOHsiM7MOxneztv9jcxZlcdiI=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=sgCNX5pip/ZalyrkHfVxPia6qND0uHAa7K+5p1Hc7LMhtztLqZSN2GNXIAjpMH+EZ KZoaLLbrxP7L/Pn0wOCoHIrG49NyjoEtoepJIg8a2TRkk8/CKiKcaLvET1XZ4Qy1ZN SmOkPXbLh3RFgaGcTjhT236+4ucrMbOq/v44CMc1DP94KV0Y9gWjKpyN+IL3uG/wBs Y+8ZKkQBuSuzXF8MtkrPNDKpaCQcI3uhstSsfhW5NfUBwubSQFXMxWx1gZqAZZfaaR owQEsk2Sm0ZvE3DzgsgR/Ws43oP1YjfVx28mWU8th75zk/capCYDNexUGXL6+wcQPD IqHue+KoxLN7Q== Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-30fd2a2496eso362867f8f.0 for ; Fri, 16 Jun 2023 05:28:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686918498; x=1689510498; 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=7aIuaUbJc/mQS9T0aBfOHsiM7MOxneztv9jcxZlcdiI=; b=TVez3h+ctQkMPJhMWr9BRp6bpBzzV9REBQyg/tdWTjbisKTIv3HaQUBtzdWdthIF+h QOdII5pEZV/I5cEvDV+tQ5L0YvChpm20Gz/WAf0mkTBQ1UJwQ7oyiXbcl3Di4U0T/+Kt zGcE8nIaaZGsMQij0dkpCdkLA0+0bRziDHh5VUTFnGAsQEGEvZdHz8rGwG3otp+ErRKi lUH3ixmfMiIU1+g3lGeo7ddZ5QeeHuKsog9FXSpPTURa8YZz0aIpcqoEBAvSFFy4WQxP pb1KTl4pOKcLCQ9oW+3BwMt9b6iJ4Z8qUpzkQ+gdJFbtj7xCEDUkWTACOxfgcv8/9ajD pEJg== X-Gm-Message-State: AC+VfDynnhmoZq0rwwLw+G9WGljLAIRwRKc7edW59I3yg/th01DOTkXc pf43WD9qp3V5JxCJZ0d71eiewsUbGA0gxpOrZctErWgjBjr/Q65+zOBkYG0rTvWaGSdYX2Rh3As soAgMeInFq2NBwqHfBX25YX70KTEsOiQW6mNGOf1J4zo= X-Received: by 2002:a5d:540a:0:b0:30f:b0de:f100 with SMTP id g10-20020a5d540a000000b0030fb0def100mr1688699wrv.23.1686918497896; Fri, 16 Jun 2023 05:28:17 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7unBLWvn7eu+/rOTRKqs5JmWynktPc0fpo3fUsOeWbUBSx9ckKi/1QQo/F4AC7I4VtmMb2rQ== X-Received: by 2002:a5d:540a:0:b0:30f:b0de:f100 with SMTP id g10-20020a5d540a000000b0030fb0def100mr1688671wrv.23.1686918497538; Fri, 16 Jun 2023 05:28:17 -0700 (PDT) Received: from localhost ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id cr4-20020a05600004e400b003063a92bbf5sm23726788wrb.70.2023.06.16.05.28.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Jun 2023 05:28:17 -0700 (PDT) From: Juerg Haefliger To: robdclark@gmail.com, quic_abhinavk@quicinc.com, dmitry.baryshkov@linaro.org, sean@poorly.run, airlied@gmail.com, daniel@ffwll.ch, linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, johan+linaro@kernel.org, konrad.dybcio@linaro.org, quic_akhilpo@quicinc.com, ribalda@chromium.org, joel@joelfernandes.org, juerg.haefliger@canonical.com Subject: [PATCH] drm/msm/adreno: Update MODULE_FIRMWARE macros Date: Fri, 16 Jun 2023 14:28:15 +0200 Message-Id: <20230616122815.1037425-1-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add missing MODULE_FIRMWARE macros and remove some for firmwares that the driver no longer references. Signed-off-by: Juerg Haefliger --- drivers/gpu/drm/msm/adreno/adreno_device.c | 23 ++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c index 8cff86e9d35c..9f70d7c1a72a 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_device.c +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c @@ -364,17 +364,32 @@ MODULE_FIRMWARE("qcom/a330_pm4.fw"); MODULE_FIRMWARE("qcom/a330_pfp.fw"); MODULE_FIRMWARE("qcom/a420_pm4.fw"); MODULE_FIRMWARE("qcom/a420_pfp.fw"); +MODULE_FIRMWARE("qcom/a506_zap.mdt"); +MODULE_FIRMWARE("qcom/a508_zap.mdt"); +MODULE_FIRMWARE("qcom/a512_zap.mdt"); MODULE_FIRMWARE("qcom/a530_pm4.fw"); MODULE_FIRMWARE("qcom/a530_pfp.fw"); MODULE_FIRMWARE("qcom/a530v3_gpmu.fw2"); MODULE_FIRMWARE("qcom/a530_zap.mdt"); -MODULE_FIRMWARE("qcom/a530_zap.b00"); -MODULE_FIRMWARE("qcom/a530_zap.b01"); -MODULE_FIRMWARE("qcom/a530_zap.b02"); +MODULE_FIRMWARE("qcom/a540_gpmu.fw2"); +MODULE_FIRMWARE("qcom/a540_zap.mdt"); +MODULE_FIRMWARE("qcom/a615_zap.mdt"); MODULE_FIRMWARE("qcom/a619_gmu.bin"); MODULE_FIRMWARE("qcom/a630_sqe.fw"); MODULE_FIRMWARE("qcom/a630_gmu.bin"); -MODULE_FIRMWARE("qcom/a630_zap.mbn"); +MODULE_FIRMWARE("qcom/a630_zap.mdt"); +MODULE_FIRMWARE("qcom/a640_gmu.bin"); +MODULE_FIRMWARE("qcom/a640_zap.mdt"); +MODULE_FIRMWARE("qcom/a650_gmu.bin"); +MODULE_FIRMWARE("qcom/a650_sqe.fw"); +MODULE_FIRMWARE("qcom/a650_zap.mdt"); +MODULE_FIRMWARE("qcom/a660_gmu.bin"); +MODULE_FIRMWARE("qcom/a660_sqe.fw"); +MODULE_FIRMWARE("qcom/a660_zap.mdt"); +MODULE_FIRMWARE("qcom/leia_pfp_470.fw"); +MODULE_FIRMWARE("qcom/leia_pm4_470.fw"); +MODULE_FIRMWARE("qcom/yamato_pfp.fw"); +MODULE_FIRMWARE("qcom/yamato_pm4.fw"); static inline bool _rev_match(uint8_t entry, uint8_t id) {