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

Commit 1b4eeea5 authored by Sonny Jiang's avatar Sonny Jiang Committed by Alex Deucher
Browse files

drm/amdgpu: add VCE support to ELM/BAF 



Ellesmere and Baffin are VCE 3.4

Signed-off-by: default avatarSonny Jiang <sonny.jiang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarJammy Zhou <Jammy.Zhou@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 38d75817

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

+10 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ 
#define FIRMWARE_CARRIZO	"amdgpu/carrizo_vce.bin"

#define FIRMWARE_FIJI		"amdgpu/fiji_vce.bin"

#define FIRMWARE_STONEY		"amdgpu/stoney_vce.bin"

#define FIRMWARE_ELLESMERE	"amdgpu/ellesmere_vce.bin"

#define FIRMWARE_BAFFIN         "amdgpu/baffin_vce.bin"



#ifdef CONFIG_DRM_AMDGPU_CIK

MODULE_FIRMWARE(FIRMWARE_BONAIRE);
@@ -62,6 +64,8 @@ MODULE_FIRMWARE(FIRMWARE_TONGA); 
MODULE_FIRMWARE(FIRMWARE_CARRIZO);

MODULE_FIRMWARE(FIRMWARE_FIJI);

MODULE_FIRMWARE(FIRMWARE_STONEY);

MODULE_FIRMWARE(FIRMWARE_ELLESMERE);

MODULE_FIRMWARE(FIRMWARE_BAFFIN);



static void amdgpu_vce_idle_work_handler(struct work_struct *work);
@@ -113,6 +117,12 @@ int amdgpu_vce_sw_init(struct amdgpu_device *adev, unsigned long size) 
	case CHIP_STONEY:

		fw_name = FIRMWARE_STONEY;

		break;

	case CHIP_ELLESMERE:

		fw_name = FIRMWARE_ELLESMERE;

		break;

	case CHIP_BAFFIN:

		fw_name = FIRMWARE_BAFFIN;

		break;



	default:

		return -EINVAL;

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

+4 −2
Original line number Diff line number Diff line
@@ -315,9 +315,11 @@ static unsigned vce_v3_0_get_harvest_config(struct amdgpu_device *adev) 
{

	u32 tmp;



	/* Fiji, Stoney are single pipe */

	/* Fiji, Stoney, Ellesmere, Baffin are single pipe */

	if ((adev->asic_type == CHIP_FIJI) ||

	    (adev->asic_type == CHIP_STONEY))

	    (adev->asic_type == CHIP_STONEY) ||

	    (adev->asic_type == CHIP_ELLESMERE) ||

	    (adev->asic_type == CHIP_BAFFIN))

		return AMDGPU_VCE_HARVEST_VCE1;



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