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

Commit 974ee3db authored by David Zhang's avatar David Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: Add Fiji support to the UVD 6.0 IP module 



Signed-off-by: default avatarDavid Zhang <david1.zhang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarJammy Zhou <Jammy.Zhou@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
parent 1a5bbb66

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

+5 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
#endif

#define FIRMWARE_TONGA		"amdgpu/tonga_uvd.bin"

#define FIRMWARE_CARRIZO	"amdgpu/carrizo_uvd.bin"

#define FIRMWARE_FIJI		"amdgpu/fiji_uvd.bin"



/**

 * amdgpu_uvd_cs_ctx - Command submission parser context
@@ -81,6 +82,7 @@ MODULE_FIRMWARE(FIRMWARE_MULLINS); 
#endif

MODULE_FIRMWARE(FIRMWARE_TONGA);

MODULE_FIRMWARE(FIRMWARE_CARRIZO);

MODULE_FIRMWARE(FIRMWARE_FIJI);



static void amdgpu_uvd_note_usage(struct amdgpu_device *adev);

static void amdgpu_uvd_idle_work_handler(struct work_struct *work);
@@ -116,6 +118,9 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev) 
	case CHIP_TONGA:

		fw_name = FIRMWARE_TONGA;

		break;

	case CHIP_FIJI:

		fw_name = FIRMWARE_FIJI;

		break;

	case CHIP_CARRIZO:

		fw_name = FIRMWARE_CARRIZO;

		break;

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

+7 −0
Original line number Diff line number Diff line
@@ -1216,6 +1216,13 @@ static const struct amdgpu_ip_block_version fiji_ip_blocks[] = 
		.rev = 0,

		.funcs = &sdma_v3_0_ip_funcs,

	},

	{

		.type = AMD_IP_BLOCK_TYPE_UVD,

		.major = 6,

		.minor = 0,

		.rev = 0,

		.funcs = &uvd_v6_0_ip_funcs,

	},

};



static const struct amdgpu_ip_block_version cz_ip_blocks[] =