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

Commit cfaba566 authored by Samuel Li's avatar Samuel Li Committed by Alex Deucher
Browse files

drm/amdgpu: add VCE support for Stoney (v2) 



Stoney is VCE 3.x single.

v2: Stoney is single pipe like Fiji

Signed-off-by: default avatarSamuel Li <samuel.li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a39c8cea

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

+5 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#define FIRMWARE_TONGA		"amdgpu/tonga_vce.bin"

#define FIRMWARE_CARRIZO	"amdgpu/carrizo_vce.bin"

#define FIRMWARE_FIJI		"amdgpu/fiji_vce.bin"

#define FIRMWARE_STONEY		"amdgpu/stoney_vce.bin"



#ifdef CONFIG_DRM_AMDGPU_CIK

MODULE_FIRMWARE(FIRMWARE_BONAIRE);
@@ -60,6 +61,7 @@ MODULE_FIRMWARE(FIRMWARE_MULLINS); 
MODULE_FIRMWARE(FIRMWARE_TONGA);

MODULE_FIRMWARE(FIRMWARE_CARRIZO);

MODULE_FIRMWARE(FIRMWARE_FIJI);

MODULE_FIRMWARE(FIRMWARE_STONEY);



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

		fw_name = FIRMWARE_FIJI;

		break;

	case CHIP_STONEY:

		fw_name = FIRMWARE_STONEY;

		break;



	default:

		return -EINVAL;

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

+3 −2
Original line number Diff line number Diff line
@@ -205,8 +205,9 @@ 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) {

	/* Fiji, Stoney are single pipe */

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

	    (adev->asic_type == CHIP_STONEY)){

		ret = AMDGPU_VCE_HARVEST_VCE1;

		return ret;

	}