drm/amdgpu: add driver support for JPEG2.0 and above (52f2e779) · Commits · 戴 / test

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -1961,6 +1961,7 @@ static int amdgpu_device_set_cg_state(struct amdgpu_device *adev,
		if (adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_UVD &&
		adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_VCE &&
		adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_VCN &&
		adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_JPEG &&
		adev->ip_blocks[i].version->funcs->set_clockgating_state) {
		/* enable clockgating to save power */
		r = adev->ip_blocks[i].version->funcs->set_clockgating_state((void *)adev,
		@@ -1991,6 +1992,7 @@ static int amdgpu_device_set_pg_state(struct amdgpu_device *adev, enum amd_power
		if (adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_UVD &&
		adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_VCE &&
		adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_VCN &&
		adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_JPEG &&
		adev->ip_blocks[i].version->funcs->set_powergating_state) {
		/* enable powergating to save power */
		r = adev->ip_blocks[i].version->funcs->set_powergating_state((void *)adev,

+7 −2

Original line number	Diff line number	Diff line
		@@ -400,7 +400,9 @@ static int amdgpu_hw_ip_info(struct amdgpu_device *adev,
		ib_size_alignment = 1;
		break;
		case AMDGPU_HW_IP_VCN_JPEG:
		type = AMD_IP_BLOCK_TYPE_VCN;
		type = (amdgpu_device_ip_get_ip_block(adev, AMD_IP_BLOCK_TYPE_JPEG)) ?
		AMD_IP_BLOCK_TYPE_JPEG : AMD_IP_BLOCK_TYPE_VCN;

		for (i = 0; i < adev->jpeg.num_jpeg_inst; i++) {
		if (adev->jpeg.harvest_config & (1 << i))
		continue;
		@@ -521,9 +523,12 @@ static int amdgpu_info_ioctl(struct drm_device dev, void data, struct drm_file
		break;
		case AMDGPU_HW_IP_VCN_DEC:
		case AMDGPU_HW_IP_VCN_ENC:
		case AMDGPU_HW_IP_VCN_JPEG:
		type = AMD_IP_BLOCK_TYPE_VCN;
		break;
		case AMDGPU_HW_IP_VCN_JPEG:
		type = (amdgpu_device_ip_get_ip_block(adev, AMD_IP_BLOCK_TYPE_JPEG)) ?
		AMD_IP_BLOCK_TYPE_JPEG : AMD_IP_BLOCK_TYPE_VCN;
		break;
		default:
		return -EINVAL;
		}