From patchwork Thu Nov 23 10:32:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Dechesne X-Patchwork-Id: 10072613 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 80EA9602DC for ; Thu, 23 Nov 2017 10:33:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 78A8029F76 for ; Thu, 23 Nov 2017 10:33:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6AB1C29F78; Thu, 23 Nov 2017 10:33:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D717E29F76 for ; Thu, 23 Nov 2017 10:33:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752415AbdKWKdR (ORCPT ); Thu, 23 Nov 2017 05:33:17 -0500 Received: from mail-wr0-f193.google.com ([209.85.128.193]:43759 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752311AbdKWKdQ (ORCPT ); Thu, 23 Nov 2017 05:33:16 -0500 Received: by mail-wr0-f193.google.com with SMTP id u40so17146283wrf.10 for ; Thu, 23 Nov 2017 02:33:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=B98iHG5JL4Clb2kGD2r4IrbdUU+aRvt5S0ma2KvtiaM=; b=eN6A0LmhLtwGmM37VobBLaNf2wXJRO6FTF+MURzDRXBgAFIqsFUsgxrY+9Xm6DAwzi 0wT7wBnsEXofLIFqFnA1g44aj2K6RPcAz014Rg1b1udeOrR6k257+scjwV5vEcawPSMn ZKupEtswnOy7r9f/G3tok4PoegkwPckrzYWGk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=B98iHG5JL4Clb2kGD2r4IrbdUU+aRvt5S0ma2KvtiaM=; b=cyKMIF+9jT/263AT/czeKUJYefTMYoEUCs1+yC1CRqh0i03ol+Xj6vTraD3swzxv4t tfRpgqao7G45vWUFRsXeOtRJJNlaYa1/owmzYWXzo1GHW5yuez1i6z6AJKq23vSZxT3A jBV+gSkKx5k91fOQTA8y6YbtG5qDnuiXhi05y4U4hZobD2cMWDTgjMPlgQ+KRCHkHn+0 sqszN9XXlnqEYjRBX4qdEl6uT3REBUg7RxGuXGaPmBlHpIAMZ47Kh927nHRbaN/xg5Se y/ZpfALS9671nwY2IrGOldw4AqMznE3U8m+FDagDBl5OH2PScFjddv5Ki36tXfzoP96X BJ5A== X-Gm-Message-State: AJaThX78EFqSZRQcU2DTtMecIMJJ6VzLJav3KwqrP3pbs4/NuDmLJdxQ qkJDlcAtCcylDpVQ8n7jDlo/QcnvcAM= X-Google-Smtp-Source: AGs4zMaHjCh1KD//2YJw7zh/3O4LUe0A5cF6QlDMq4YCF0xjo8wPhpns5fd9wa3MRGHkBa4TYTCtcg== X-Received: by 10.223.150.118 with SMTP id c51mr18725562wra.202.1511433195136; Thu, 23 Nov 2017 02:33:15 -0800 (PST) Received: from localhost.localdomain (AStLambert-681-1-97-104.w90-86.abo.wanadoo.fr. [90.86.38.104]) by smtp.gmail.com with ESMTPSA id s195sm7202280wmb.33.2017.11.23.02.33.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Nov 2017 02:33:13 -0800 (PST) From: Nicolas Dechesne To: airlied@linux.ie, robdclark@gmail.com, freedreno@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org, ben@decadent.org.uk, Nicolas Dechesne Subject: [PATCH] drm/msm: update adreno firmware path in MODULE_FIRMWARE Date: Thu, 23 Nov 2017 11:32:49 +0100 Message-Id: <20171123103249.7827-1-nicolas.dechesne@linaro.org> X-Mailer: git-send-email 2.15.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The preferred location for Adreno firmware files is now in qcom/ subfolder, especially now that we are adding some of them in linux-firmware. Reported-by: Ben Hutchings Signed-off-by: Nicolas Dechesne Reviewed-by: Rob Clark --- drivers/gpu/drm/msm/adreno/adreno_device.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c index 05022ea2a007..3c1d23b9ddc3 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_device.c +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c @@ -90,14 +90,14 @@ static const struct adreno_info gpulist[] = { }, }; -MODULE_FIRMWARE("a300_pm4.fw"); -MODULE_FIRMWARE("a300_pfp.fw"); -MODULE_FIRMWARE("a330_pm4.fw"); -MODULE_FIRMWARE("a330_pfp.fw"); -MODULE_FIRMWARE("a420_pm4.fw"); -MODULE_FIRMWARE("a420_pfp.fw"); -MODULE_FIRMWARE("a530_fm4.fw"); -MODULE_FIRMWARE("a530_pfp.fw"); +MODULE_FIRMWARE("qcom/a300_pm4.fw"); +MODULE_FIRMWARE("qcom/a300_pfp.fw"); +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/a530_fm4.fw"); +MODULE_FIRMWARE("qcom/a530_pfp.fw"); static inline bool _rev_match(uint8_t entry, uint8_t id) {