Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce206464 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: switch firmware path for CIK parts (v2) 



Use separate firmware path for amdgpu to avoid conflicts
with radeon on CIK parts.

v2: squash in logic simplification (Alex)

Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9fc15f5f

drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c

+4 −4
Original line number Diff line number Diff line
@@ -314,17 +314,17 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device, 
					(adev->pdev->revision == 0x81) ||

					(adev->pdev->device == 0x665f)) {

					info->is_kicker = true;

					strcpy(fw_name, "radeon/bonaire_k_smc.bin");

					strcpy(fw_name, "amdgpu/bonaire_k_smc.bin");

				} else {

					strcpy(fw_name, "radeon/bonaire_smc.bin");

					strcpy(fw_name, "amdgpu/bonaire_smc.bin");

				}

				break;

			case CHIP_HAWAII:

				if (adev->pdev->revision == 0x80) {

					info->is_kicker = true;

					strcpy(fw_name, "radeon/hawaii_k_smc.bin");

					strcpy(fw_name, "amdgpu/hawaii_k_smc.bin");

				} else {

					strcpy(fw_name, "radeon/hawaii_smc.bin");

					strcpy(fw_name, "amdgpu/hawaii_smc.bin");

				}

				break;

			case CHIP_TOPAZ:

drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c

+5 −5
Original line number Diff line number Diff line
@@ -53,11 +53,11 @@ 


/* Firmware Names */

#ifdef CONFIG_DRM_AMDGPU_CIK

#define FIRMWARE_BONAIRE	"radeon/bonaire_uvd.bin"

#define FIRMWARE_KABINI	"radeon/kabini_uvd.bin"

#define FIRMWARE_KAVERI	"radeon/kaveri_uvd.bin"

#define FIRMWARE_HAWAII	"radeon/hawaii_uvd.bin"

#define FIRMWARE_MULLINS	"radeon/mullins_uvd.bin"

#define FIRMWARE_BONAIRE	"amdgpu/bonaire_uvd.bin"

#define FIRMWARE_KABINI	"amdgpu/kabini_uvd.bin"

#define FIRMWARE_KAVERI	"amdgpu/kaveri_uvd.bin"

#define FIRMWARE_HAWAII	"amdgpu/hawaii_uvd.bin"

#define FIRMWARE_MULLINS	"amdgpu/mullins_uvd.bin"

#endif

#define FIRMWARE_TONGA		"amdgpu/tonga_uvd.bin"

#define FIRMWARE_CARRIZO	"amdgpu/carrizo_uvd.bin"

drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c

+5 −5
Original line number Diff line number Diff line
@@ -40,11 +40,11 @@ 


/* Firmware Names */

#ifdef CONFIG_DRM_AMDGPU_CIK

#define FIRMWARE_BONAIRE	"radeon/bonaire_vce.bin"

#define FIRMWARE_KABINI	"radeon/kabini_vce.bin"

#define FIRMWARE_KAVERI	"radeon/kaveri_vce.bin"

#define FIRMWARE_HAWAII	"radeon/hawaii_vce.bin"

#define FIRMWARE_MULLINS	"radeon/mullins_vce.bin"

#define FIRMWARE_BONAIRE	"amdgpu/bonaire_vce.bin"

#define FIRMWARE_KABINI	"amdgpu/kabini_vce.bin"

#define FIRMWARE_KAVERI	"amdgpu/kaveri_vce.bin"

#define FIRMWARE_HAWAII	"amdgpu/hawaii_vce.bin"

#define FIRMWARE_MULLINS	"amdgpu/mullins_vce.bin"

#endif

#define FIRMWARE_TONGA		"amdgpu/tonga_vce.bin"

#define FIRMWARE_CARRIZO	"amdgpu/carrizo_vce.bin"

drivers/gpu/drm/amd/amdgpu/ci_dpm.c

+5 −5
Original line number Diff line number Diff line
@@ -49,10 +49,10 @@ 
#include "gmc/gmc_7_1_d.h"

#include "gmc/gmc_7_1_sh_mask.h"



MODULE_FIRMWARE("radeon/bonaire_smc.bin");

MODULE_FIRMWARE("radeon/bonaire_k_smc.bin");

MODULE_FIRMWARE("radeon/hawaii_smc.bin");

MODULE_FIRMWARE("radeon/hawaii_k_smc.bin");

MODULE_FIRMWARE("amdgpu/bonaire_smc.bin");

MODULE_FIRMWARE("amdgpu/bonaire_k_smc.bin");

MODULE_FIRMWARE("amdgpu/hawaii_smc.bin");

MODULE_FIRMWARE("amdgpu/hawaii_k_smc.bin");



#define MC_CG_ARB_FREQ_F0           0x0a

#define MC_CG_ARB_FREQ_F1           0x0b
@@ -5815,7 +5815,7 @@ static int ci_dpm_init_microcode(struct amdgpu_device *adev) 
	default: BUG();

	}



	snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", chip_name);

	snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_smc.bin", chip_name);

	err = request_firmware(&adev->pm.fw, fw_name, adev->dev);

	if (err)

		goto out;

drivers/gpu/drm/amd/amdgpu/cik_sdma.c

+12 −12
Original line number Diff line number Diff line
@@ -54,16 +54,16 @@ static void cik_sdma_set_buffer_funcs(struct amdgpu_device *adev); 
static void cik_sdma_set_vm_pte_funcs(struct amdgpu_device *adev);

static int cik_sdma_soft_reset(void *handle);



MODULE_FIRMWARE("radeon/bonaire_sdma.bin");

MODULE_FIRMWARE("radeon/bonaire_sdma1.bin");

MODULE_FIRMWARE("radeon/hawaii_sdma.bin");

MODULE_FIRMWARE("radeon/hawaii_sdma1.bin");

MODULE_FIRMWARE("radeon/kaveri_sdma.bin");

MODULE_FIRMWARE("radeon/kaveri_sdma1.bin");

MODULE_FIRMWARE("radeon/kabini_sdma.bin");

MODULE_FIRMWARE("radeon/kabini_sdma1.bin");

MODULE_FIRMWARE("radeon/mullins_sdma.bin");

MODULE_FIRMWARE("radeon/mullins_sdma1.bin");

MODULE_FIRMWARE("amdgpu/bonaire_sdma.bin");

MODULE_FIRMWARE("amdgpu/bonaire_sdma1.bin");

MODULE_FIRMWARE("amdgpu/hawaii_sdma.bin");

MODULE_FIRMWARE("amdgpu/hawaii_sdma1.bin");

MODULE_FIRMWARE("amdgpu/kaveri_sdma.bin");

MODULE_FIRMWARE("amdgpu/kaveri_sdma1.bin");

MODULE_FIRMWARE("amdgpu/kabini_sdma.bin");

MODULE_FIRMWARE("amdgpu/kabini_sdma1.bin");

MODULE_FIRMWARE("amdgpu/mullins_sdma.bin");

MODULE_FIRMWARE("amdgpu/mullins_sdma1.bin");



u32 amdgpu_cik_gpu_check_soft_reset(struct amdgpu_device *adev);
@@ -132,9 +132,9 @@ static int cik_sdma_init_microcode(struct amdgpu_device *adev) 


	for (i = 0; i < adev->sdma.num_instances; 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.instance[i].fw, fw_name, adev->dev);

		if (err)

			goto out;