From patchwork Wed May 27 03:20:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 6486821 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DF28F9F444 for ; Wed, 27 May 2015 03:21:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 93BBE206FC for ; Wed, 27 May 2015 03:21:09 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 4119920700 for ; Wed, 27 May 2015 03:21:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E40F56E8E3; Tue, 26 May 2015 20:21:01 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk0-f169.google.com (mail-qk0-f169.google.com [209.85.220.169]) by gabe.freedesktop.org (Postfix) with ESMTP id 2F4656E8D2 for ; Tue, 26 May 2015 20:20:57 -0700 (PDT) Received: by qkgx75 with SMTP id x75so105197176qkg.1 for ; Tue, 26 May 2015 20:20:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=xOW/eSe5Rrb7S7RYJ357rS7SzMV6hKtSYN/J81lXa3Q=; b=rWW8aY18NlkmEqsydkTVEZNvDy+uq6+VLUtKcwhNx9/ELkCgSNRuaHZzAZgwYKBNS2 gAGJ0Il1kP3Uy1l1UlzdnGv/ACADb0ZxVTx/+10YSEf8CKO6BW0qj6xqXtj+UuuYoFUI 1Ie5D4D6ZrogPJD79uP2fH4tObesFXZ7NMd6jzrNNeuThroagf7IxAUfJCzA9t84qLRP A7izLY5fkNqwudR71PvHtKDbrNfnfRt91mkxU2gWUvBhgCNwaOcoQ1TOGOJsunA3aCmy 9plb8nMDxhraqarCGhXVbmT2Lfnao7dHuKBAQMm7qrYutTjCLM0JccmfnE4PGW7DxMJi 6Oxw== X-Received: by 10.140.85.101 with SMTP id m92mr38162720qgd.37.1432696856822; Tue, 26 May 2015 20:20:56 -0700 (PDT) Received: from localhost.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by mx.google.com with ESMTPSA id 20sm9629127qhf.14.2015.05.26.20.20.55 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 May 2015 20:20:56 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH 65/88] drm/amdgpu: switch to amdgpu folder for firmware files v2 Date: Tue, 26 May 2015 23:20:04 -0400 Message-Id: <1432696827-3752-35-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1432696827-3752-1-git-send-email-alexander.deucher@amd.com> References: <1432696827-3752-1-git-send-email-alexander.deucher@amd.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jammy Zhou v2: keep using radeon folder for CIK Signed-off-by: Jammy Zhou Reviewed-by: Christian König --- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 4 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 4 +-- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 52 ++++++++++++++++---------------- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 6 ++-- drivers/gpu/drm/amd/amdgpu/iceland_dpm.c | 4 +-- drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 8 ++--- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 12 ++++---- drivers/gpu/drm/amd/amdgpu/tonga_dpm.c | 4 +-- 8 files changed, 47 insertions(+), 47 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c index c03bce6..4b0be90 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c @@ -50,8 +50,8 @@ #define FIRMWARE_HAWAII "radeon/hawaii_uvd.bin" #define FIRMWARE_MULLINS "radeon/mullins_uvd.bin" #endif -#define FIRMWARE_TONGA "radeon/tonga_uvd.bin" -#define FIRMWARE_CARRIZO "radeon/carrizo_uvd.bin" +#define FIRMWARE_TONGA "amdgpu/tonga_uvd.bin" +#define FIRMWARE_CARRIZO "amdgpu/carrizo_uvd.bin" /** * amdgpu_uvd_cs_ctx - Command submission parser context diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c index c65d93c..803ee60 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c @@ -46,8 +46,8 @@ #define FIRMWARE_HAWAII "radeon/hawaii_vce.bin" #define FIRMWARE_MULLINS "radeon/mullins_vce.bin" #endif -#define FIRMWARE_TONGA "radeon/tonga_vce.bin" -#define FIRMWARE_CARRIZO "radeon/carrizo_vce.bin" +#define FIRMWARE_TONGA "amdgpu/tonga_vce.bin" +#define FIRMWARE_CARRIZO "amdgpu/carrizo_vce.bin" #ifdef CONFIG_DRM_AMDGPU_CIK MODULE_FIRMWARE(FIRMWARE_BONAIRE); diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c index 188a7ab..4597256 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c @@ -66,26 +66,26 @@ #define MACRO_TILE_ASPECT(x) ((x) << GB_MACROTILE_MODE0__MACRO_TILE_ASPECT__SHIFT) #define NUM_BANKS(x) ((x) << GB_MACROTILE_MODE0__NUM_BANKS__SHIFT) -MODULE_FIRMWARE("radeon/carrizo_ce.bin"); -MODULE_FIRMWARE("radeon/carrizo_pfp.bin"); -MODULE_FIRMWARE("radeon/carrizo_me.bin"); -MODULE_FIRMWARE("radeon/carrizo_mec.bin"); -MODULE_FIRMWARE("radeon/carrizo_mec2.bin"); -MODULE_FIRMWARE("radeon/carrizo_rlc.bin"); - -MODULE_FIRMWARE("radeon/tonga_ce.bin"); -MODULE_FIRMWARE("radeon/tonga_pfp.bin"); -MODULE_FIRMWARE("radeon/tonga_me.bin"); -MODULE_FIRMWARE("radeon/tonga_mec.bin"); -MODULE_FIRMWARE("radeon/tonga_mec2.bin"); -MODULE_FIRMWARE("radeon/tonga_rlc.bin"); - -MODULE_FIRMWARE("radeon/topaz_ce.bin"); -MODULE_FIRMWARE("radeon/topaz_pfp.bin"); -MODULE_FIRMWARE("radeon/topaz_me.bin"); -MODULE_FIRMWARE("radeon/topaz_mec.bin"); -MODULE_FIRMWARE("radeon/topaz_mec2.bin"); -MODULE_FIRMWARE("radeon/topaz_rlc.bin"); +MODULE_FIRMWARE("amdgpu/carrizo_ce.bin"); +MODULE_FIRMWARE("amdgpu/carrizo_pfp.bin"); +MODULE_FIRMWARE("amdgpu/carrizo_me.bin"); +MODULE_FIRMWARE("amdgpu/carrizo_mec.bin"); +MODULE_FIRMWARE("amdgpu/carrizo_mec2.bin"); +MODULE_FIRMWARE("amdgpu/carrizo_rlc.bin"); + +MODULE_FIRMWARE("amdgpu/tonga_ce.bin"); +MODULE_FIRMWARE("amdgpu/tonga_pfp.bin"); +MODULE_FIRMWARE("amdgpu/tonga_me.bin"); +MODULE_FIRMWARE("amdgpu/tonga_mec.bin"); +MODULE_FIRMWARE("amdgpu/tonga_mec2.bin"); +MODULE_FIRMWARE("amdgpu/tonga_rlc.bin"); + +MODULE_FIRMWARE("amdgpu/topaz_ce.bin"); +MODULE_FIRMWARE("amdgpu/topaz_pfp.bin"); +MODULE_FIRMWARE("amdgpu/topaz_me.bin"); +MODULE_FIRMWARE("amdgpu/topaz_mec.bin"); +MODULE_FIRMWARE("amdgpu/topaz_mec2.bin"); +MODULE_FIRMWARE("amdgpu/topaz_rlc.bin"); static const struct amdgpu_gds_reg_offset amdgpu_gds_reg_offset[] = { @@ -597,7 +597,7 @@ static int gfx_v8_0_init_microcode(struct amdgpu_device *adev) BUG(); } - snprintf(fw_name, sizeof(fw_name), "radeon/%s_pfp.bin", chip_name); + snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_pfp.bin", chip_name); err = request_firmware(&adev->gfx.pfp_fw, fw_name, adev->dev); if (err) goto out; @@ -605,7 +605,7 @@ static int gfx_v8_0_init_microcode(struct amdgpu_device *adev) if (err) goto out; - snprintf(fw_name, sizeof(fw_name), "radeon/%s_me.bin", chip_name); + snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_me.bin", chip_name); err = request_firmware(&adev->gfx.me_fw, fw_name, adev->dev); if (err) goto out; @@ -613,7 +613,7 @@ static int gfx_v8_0_init_microcode(struct amdgpu_device *adev) if (err) goto out; - snprintf(fw_name, sizeof(fw_name), "radeon/%s_ce.bin", chip_name); + snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ce.bin", chip_name); err = request_firmware(&adev->gfx.ce_fw, fw_name, adev->dev); if (err) goto out; @@ -621,13 +621,13 @@ static int gfx_v8_0_init_microcode(struct amdgpu_device *adev) if (err) goto out; - snprintf(fw_name, sizeof(fw_name), "radeon/%s_rlc.bin", chip_name); + snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_rlc.bin", chip_name); err = request_firmware(&adev->gfx.rlc_fw, fw_name, adev->dev); if (err) goto out; err = amdgpu_ucode_validate(adev->gfx.rlc_fw); - snprintf(fw_name, sizeof(fw_name), "radeon/%s_mec.bin", chip_name); + snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec.bin", chip_name); err = request_firmware(&adev->gfx.mec_fw, fw_name, adev->dev); if (err) goto out; @@ -635,7 +635,7 @@ static int gfx_v8_0_init_microcode(struct amdgpu_device *adev) if (err) goto out; - snprintf(fw_name, sizeof(fw_name), "radeon/%s_mec2.bin", chip_name); + snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec2.bin", chip_name); err = request_firmware(&adev->gfx.mec2_fw, fw_name, adev->dev); if (!err) { err = amdgpu_ucode_validate(adev->gfx.mec2_fw); diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c index ac8cff8..7f6c52f 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c @@ -41,8 +41,8 @@ static void gmc_v8_0_set_gart_funcs(struct amdgpu_device *adev); static void gmc_v8_0_set_irq_funcs(struct amdgpu_device *adev); -MODULE_FIRMWARE("radeon/topaz_mc.bin"); -MODULE_FIRMWARE("radeon/tonga_mc.bin"); +MODULE_FIRMWARE("amdgpu/topaz_mc.bin"); +MODULE_FIRMWARE("amdgpu/tonga_mc.bin"); static const u32 golden_settings_tonga_a11[] = { @@ -206,7 +206,7 @@ static int gmc_v8_0_init_microcode(struct amdgpu_device *adev) default: BUG(); } - snprintf(fw_name, sizeof(fw_name), "radeon/%s_mc.bin", chip_name); + snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mc.bin", chip_name); err = request_firmware(&adev->mc.fw, fw_name, adev->dev); if (err) goto out; diff --git a/drivers/gpu/drm/amd/amdgpu/iceland_dpm.c b/drivers/gpu/drm/amd/amdgpu/iceland_dpm.c index 8f5c54b..0688b88 100644 --- a/drivers/gpu/drm/amd/amdgpu/iceland_dpm.c +++ b/drivers/gpu/drm/amd/amdgpu/iceland_dpm.c @@ -26,7 +26,7 @@ #include "amdgpu.h" #include "iceland_smumgr.h" -MODULE_FIRMWARE("radeon/topaz_smc.bin"); +MODULE_FIRMWARE("amdgpu/topaz_smc.bin"); static void iceland_dpm_set_funcs(struct amdgpu_device *adev); @@ -39,7 +39,7 @@ static int iceland_dpm_early_init(struct amdgpu_device *adev) static int iceland_dpm_init_microcode(struct amdgpu_device *adev) { - char fw_name[30] = "radeon/topaz_smc.bin"; + char fw_name[30] = "amdgpu/topaz_smc.bin"; int err; err = request_firmware(&adev->pm.fw, fw_name, adev->dev); diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c index f1423a4..99b8b32 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c @@ -49,8 +49,8 @@ static void sdma_v2_4_set_buffer_funcs(struct amdgpu_device *adev); static void sdma_v2_4_set_vm_pte_funcs(struct amdgpu_device *adev); static void sdma_v2_4_set_irq_funcs(struct amdgpu_device *adev); -MODULE_FIRMWARE("radeon/topaz_sdma.bin"); -MODULE_FIRMWARE("radeon/topaz_sdma1.bin"); +MODULE_FIRMWARE("amdgpu/topaz_sdma.bin"); +MODULE_FIRMWARE("amdgpu/topaz_sdma1.bin"); static const u32 sdma_offsets[SDMA_MAX_INSTANCE] = { @@ -133,9 +133,9 @@ static int sdma_v2_4_init_microcode(struct amdgpu_device *adev) for (i = 0; i < SDMA_MAX_INSTANCE; i++) { if (i == 0) - snprintf(fw_name, sizeof(fw_name), "radeon/%s_sdma.bin", chip_name); + snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sdma.bin", chip_name); else - snprintf(fw_name, sizeof(fw_name), "radeon/%s_sdma1.bin", chip_name); + snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sdma1.bin", chip_name); err = request_firmware(&adev->sdma[i].fw, fw_name, adev->dev); if (err) goto out; diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c index 7c4abff..86a5278 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c @@ -49,10 +49,10 @@ static void sdma_v3_0_set_buffer_funcs(struct amdgpu_device *adev); static void sdma_v3_0_set_vm_pte_funcs(struct amdgpu_device *adev); static void sdma_v3_0_set_irq_funcs(struct amdgpu_device *adev); -MODULE_FIRMWARE("radeon/tonga_sdma.bin"); -MODULE_FIRMWARE("radeon/tonga_sdma1.bin"); -MODULE_FIRMWARE("radeon/carrizo_sdma.bin"); -MODULE_FIRMWARE("radeon/carrizo_sdma1.bin"); +MODULE_FIRMWARE("amdgpu/tonga_sdma.bin"); +MODULE_FIRMWARE("amdgpu/tonga_sdma1.bin"); +MODULE_FIRMWARE("amdgpu/carrizo_sdma.bin"); +MODULE_FIRMWARE("amdgpu/carrizo_sdma1.bin"); static const u32 sdma_offsets[SDMA_MAX_INSTANCE] = { @@ -174,9 +174,9 @@ static int sdma_v3_0_init_microcode(struct amdgpu_device *adev) for (i = 0; i < SDMA_MAX_INSTANCE; i++) { if (i == 0) - snprintf(fw_name, sizeof(fw_name), "radeon/%s_sdma.bin", chip_name); + snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sdma.bin", chip_name); else - snprintf(fw_name, sizeof(fw_name), "radeon/%s_sdma1.bin", chip_name); + snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sdma1.bin", chip_name); err = request_firmware(&adev->sdma[i].fw, fw_name, adev->dev); if (err) goto out; diff --git a/drivers/gpu/drm/amd/amdgpu/tonga_dpm.c b/drivers/gpu/drm/amd/amdgpu/tonga_dpm.c index 98bd707..cf97d49 100644 --- a/drivers/gpu/drm/amd/amdgpu/tonga_dpm.c +++ b/drivers/gpu/drm/amd/amdgpu/tonga_dpm.c @@ -26,7 +26,7 @@ #include "amdgpu.h" #include "tonga_smumgr.h" -MODULE_FIRMWARE("radeon/tonga_smc.bin"); +MODULE_FIRMWARE("amdgpu/tonga_smc.bin"); static void tonga_dpm_set_funcs(struct amdgpu_device *adev); @@ -39,7 +39,7 @@ static int tonga_dpm_early_init(struct amdgpu_device *adev) static int tonga_dpm_init_microcode(struct amdgpu_device *adev) { - char fw_name[30] = "radeon/tonga_smc.bin"; + char fw_name[30] = "amdgpu/tonga_smc.bin"; int err; err = request_firmware(&adev->pm.fw, fw_name, adev->dev);