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;
From:   Patrick Whewell <patrick.whewell@sightlineapplications.com>
Cc:     Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
        William Gray <william.gray@linaro.org>,
        Patrick Whewell <patrick.whewell@sightlineapplications.com>,
        Stanimir Varbanov <stanimir.k.varbanov@gmail.com>,
        Vikash Garodia <quic_vgarodia@quicinc.com>,
        "Bryan O'Donoghue" <bryan.odonoghue@linaro.org>,
        Andy Gross <agross@kernel.org>,
        Bjorn Andersson <andersson@kernel.org>,
        Konrad Dybcio <konrad.dybcio@linaro.org>,
        Mauro Carvalho Chehab <mchehab@kernel.org>,
        linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH v2] media: venus: Fix firmware path for resources
Date:   Wed, 19 Jul 2023 14:49:42 -0700
Message-Id: <20230719214943.22641-1-patrick.whewell@sightlineapplications.com>
In-Reply-To: <6afa314b-ca5e-a924-de2f-f1db90770623@linaro.org>
References: <6afa314b-ca5e-a924-de2f-f1db90770623@linaro.org>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?dZFtIkG/r8qU7NIl6Wi7tMUHZgxkW70MBixUszSUv9/iMaefgbHnfggnnUrS?=
 =?us-ascii?Q?p8tXtJHsPi0HH5jI8sH/ap2drTpNbJ0iNQHzgueHDILZMON3+xM8//8loAVc?=
 =?us-ascii?Q?hSxv8MjFzdNuYcWAg5xFJlVSbXF1IV7mAjgRLMs29fRnIsqYlBxNK2d32YIp?=
 =?us-ascii?Q?8MXx1dG65S9WaZr30IblFGnb2nw3fNZCctjiJ73TvC81Eh9uU/5DGk7kosVR?=
 =?us-ascii?Q?vOFaZYQ2vVEW+JoR03jvdergqGozwje8/XOJKvkXpHmbkPQc8uGPYwE9VvYv?=
 =?us-ascii?Q?36MHkAiWBZR0gTTN9lIZSYLaTGqi97/IQUNZRKzvKJcrnN+JnI6zIirPeSbK?=
 =?us-ascii?Q?MDAYzBSnjMQwl80smyIYExzMmuPgiS2aEEpUdSwOkW6pz/t0C1XljfepAn+0?=
 =?us-ascii?Q?S+kxiyzztpZCQp6tF4weRa7PGOFjWLMRRuWCWtqRPFW24z4ElfHTbYeAHGZ5?=
 =?us-ascii?Q?AQl+GRwa63WcCTNUJOxDBkA8QPmagHnHm2O88+ynkFGIzbYL2nT3KCpzk5zf?=
 =?us-ascii?Q?kGHu6sa9PyLQY/YW1BfUmOxB+Mvmmokq0rxk5PLFo21ybRSQnMbkPYbrkDuQ?=
 =?us-ascii?Q?8WtOqS8snd7HCa2kFIRrlKW1yGcco4WZ44nmkxJyv1Xux6Jl/ujMQmxG2qtv?=
 =?us-ascii?Q?lr8WTDtqwhdpzGYlpv/aW0dALbZbmW6pvtp32tUts9Y2JUEhuuKUbvo6qIgg?=
 =?us-ascii?Q?GHEP5A6haDe2JEZmJ31AGBV6HAMbPJIoC2VRr7hFZvVGGVTK7H7Chl7DcDwn?=
 =?us-ascii?Q?xf3VlDdvisPgBKiSabL9vtctkbDGgJ3ntk7rYnZxqUTX506B4t6FJeBXT4LI?=
 =?us-ascii?Q?dOtyftlLFQDLprnY+0fYyAzNZ8Yq3iNcI8owr/8ufsH6f+n8tx9wctySVsMu?=
 =?us-ascii?Q?2REJCC6+VGMmCXX+QDkzlAbg28Z3F34mKyCVGpeRgEebXfN7K2sdS7/gp2vm?=
 =?us-ascii?Q?3oj4yDEq6/mGXb0jql5pDcjz2aCbPchqPRDOUh9kpan7SyA5FMWSgq49WbZ5?=
 =?us-ascii?Q?hvSpvtzsbhFnC+H5ewIg9ldEslQVcOdUgChEqk9NZ1ECN5quv8QLtvV/AUyF?=
 =?us-ascii?Q?6hfUw6chFSW2UpHNk7oPjNbTiUYv2msSMa0Lrsa3ilM2nDm7ltGPz6k9Lxmw?=
 =?us-ascii?Q?p9kLh+NLAou+0y4Hywk9W8QRM3HRPh4wBBBGVpOGxu+IUUGR64OAXsVl3qK9?=
 =?us-ascii?Q?ZW7ZNZSR3q1d1Rv78wv9T0FJbKuoFj9TIxP7YusjzUufOrGSsep6BG5jWUNK?=
 =?us-ascii?Q?97ecVQzA/KHmndIhJAiOA7BRvwK6B+eE1E+GlzEoB1MxAAaJmdiIbsjOEZda?=
 =?us-ascii?Q?r5kVojblMZkmvc8+N1erhZF9+UvIknModRgvdhljf8Z7PmGwbXAkWaN6/Fsc?=
 =?us-ascii?Q?NzrEl2b+ME053ZgBoN6inlyQl/rAYrv63XKoLX4UFzsur/PJ8AWJntk5Un7d?=
 =?us-ascii?Q?3qeAzfLTrXKPeFocib0jkIbPq+c7/YbpF748ejzocMvc5kwJLxjqbBR7wUOD?=
 =?us-ascii?Q?xVvQRBd0paUyeblZ5/0AZQct6Q/zJ1TOhepqGU1o7JV2cY0UYFdXVd+8lSHt?=
 =?us-ascii?Q?GNKA03GABMA8YwFLt9i23tabtoEyJuns67s1CGNTfVWsQl0iv/FhElO9Rs24?=
 =?us-ascii?Q?Ty+UQtMiRFQgRNR2aRAnRyoSIj1RRkfSIUkcTos26sd6?=
X-OriginatorOrg: sightlineapplications.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 338f072e-e1f2-4521-f18f-08db88a216b1
X-MS-Exchange-CrossTenant-AuthSource: SN4PR18MB4918.namprd18.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2023 21:49:55.2288
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 6f56283c-2197-4913-9761-239c8b420cf0
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 33bUTNxZkhpPF8ydX6GdarHVdD86MZUPqZqq6dVTwVqPu5Qn20wk7bx/Ozd/3raN/AGlAEts7l0onUKZfViXy7csSJDsW8xuLewiz8CQHx/MANz+pG6jbwKvm8lyDQtPVEcq1jpJErsm6DTiLn+jOw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR18MB5015
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
To:     unlisted-recipients:; (no To-header on input)
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The firmware path for some of the resources is still the old format. This
fixes the path to address the firmware correctly using the new .mbn
format.

Signed-off-by: Patrick Whewell <patrick.whewell@sightlineapplications.com>
---
I've updated all .fwname to match the .mbn format. There is a
qcom/venus-4.4/venus.mdt for the sdm660 that still remains but the linux-firmware
package does not contain that firmware file anymore, so i left as is.

 drivers/media/platform/qcom/venus/core.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
index 2ae867cb4c48..2d62669d99e1 100644
--- a/drivers/media/platform/qcom/venus/core.c
+++ b/drivers/media/platform/qcom/venus/core.c
@@ -548,7 +548,7 @@ static const struct venus_resources msm8916_res = {
 	.vmem_size = 0,
 	.vmem_addr = 0,
 	.dma_mask = 0xddc00000 - 1,
-	.fwname = "qcom/venus-1.8/venus.mdt",
+	.fwname = "qcom/venus-1.8/venus.mbn",
 };
 
 static const struct freq_tbl msm8996_freq_table[] = {
@@ -581,7 +581,7 @@ static const struct venus_resources msm8996_res = {
 	.vmem_size = 0,
 	.vmem_addr = 0,
 	.dma_mask = 0xddc00000 - 1,
-	.fwname = "qcom/venus-4.2/venus.mdt",
+	.fwname = "qcom/venus-4.2/venus.mbn",
 };
 
 static const struct freq_tbl sdm660_freq_table[] = {
@@ -688,7 +688,7 @@ static const struct venus_resources sdm845_res = {
 	.vmem_size = 0,
 	.vmem_addr = 0,
 	.dma_mask = 0xe0000000 - 1,
-	.fwname = "qcom/venus-5.2/venus.mdt",
+	.fwname = "qcom/venus-5.2/venus.mbn",
 };
 
 static const struct venus_resources sdm845_res_v2 = {
@@ -717,7 +717,7 @@ static const struct venus_resources sdm845_res_v2 = {
 	.cp_size = 0x70800000,
 	.cp_nonpixel_start = 0x1000000,
 	.cp_nonpixel_size = 0x24800000,
-	.fwname = "qcom/venus-5.2/venus.mdt",
+	.fwname = "qcom/venus-5.2/venus.mbn",
 };
 
 static const struct freq_tbl sc7180_freq_table[] = {
@@ -760,7 +760,7 @@ static const struct venus_resources sc7180_res = {
 	.vmem_size = 0,
 	.vmem_addr = 0,
 	.dma_mask = 0xe0000000 - 1,
-	.fwname = "qcom/venus-5.4/venus.mdt",
+	.fwname = "qcom/venus-5.4/venus.mbn",
 };
 
 static const struct freq_tbl sm8250_freq_table[] = {
@@ -814,7 +814,7 @@ static const struct venus_resources sm8250_res = {
 	.vmem_size = 0,
 	.vmem_addr = 0,
 	.dma_mask = 0xe0000000 - 1,
-	.fwname = "qcom/vpu-1.0/venus.mdt",
+	.fwname = "qcom/vpu-1.0/venus.mbn",
 };
 
 static const struct freq_tbl sc7280_freq_table[] = {
-- 
2.25.1