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

Commit 188a9bcd authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: add support for VCE 3.x on Fiji 



VCE on fiji is single pipe only.

Reviewed-by: default avatarDavid Zhang <david1.zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 974ee3db

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

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

#define FIRMWARE_TONGA		"amdgpu/tonga_vce.bin"

#define FIRMWARE_CARRIZO	"amdgpu/carrizo_vce.bin"

#define FIRMWARE_FIJI		"amdgpu/fiji_vce.bin"



#ifdef CONFIG_DRM_AMDGPU_CIK

MODULE_FIRMWARE(FIRMWARE_BONAIRE);
@@ -58,6 +59,7 @@ MODULE_FIRMWARE(FIRMWARE_MULLINS); 
#endif

MODULE_FIRMWARE(FIRMWARE_TONGA);

MODULE_FIRMWARE(FIRMWARE_CARRIZO);

MODULE_FIRMWARE(FIRMWARE_FIJI);



static void amdgpu_vce_idle_work_handler(struct work_struct *work);
@@ -101,6 +103,9 @@ int amdgpu_vce_sw_init(struct amdgpu_device *adev, unsigned long size) 
	case CHIP_CARRIZO:

		fw_name = FIRMWARE_CARRIZO;

		break;

	case CHIP_FIJI:

		fw_name = FIRMWARE_FIJI;

		break;



	default:

		return -EINVAL;

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

+7 −0
Original line number Diff line number Diff line
@@ -205,6 +205,13 @@ static unsigned vce_v3_0_get_harvest_config(struct amdgpu_device *adev) 
	u32 tmp;

	unsigned ret;



	/* Fiji is single pipe */

	if (adev->asic_type == CHIP_FIJI) {

		ret = AMDGPU_VCE_HARVEST_VCE1;

		return ret;

	}



	/* Tonga and CZ are dual or single pipe */

	if (adev->flags & AMD_IS_APU)

		tmp = (RREG32_SMC(ixVCE_HARVEST_FUSE_MACRO__ADDRESS) &

		       VCE_HARVEST_FUSE_MACRO__MASK) >>

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

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

		.funcs = &uvd_v6_0_ip_funcs,

	},

	{

		.type = AMD_IP_BLOCK_TYPE_VCE,

		.major = 3,

		.minor = 0,

		.rev = 0,

		.funcs = &vce_v3_0_ip_funcs,

	},

};



static const struct amdgpu_ip_block_version cz_ip_blocks[] =