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

Commit b7e6cd57 authored by Boyuan Zhang's avatar Boyuan Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: add AMDGPU_HW_IP_VCN_JPEG to queue mgr 



Add AMDGPU_HW_IP_VCN_JPEG to queue mgr

Signed-off-by: default avatarBoyuan Zhang <boyuan.zhang@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4bafe440

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -96,6 +96,9 @@ static int amdgpu_identity_map(struct amdgpu_device *adev, 
	case AMDGPU_HW_IP_VCN_ENC:

	case AMDGPU_HW_IP_VCN_ENC:

		*out_ring = &adev->vcn.ring_enc[ring];

		*out_ring = &adev->vcn.ring_enc[ring];

		break;

		break;

	case AMDGPU_HW_IP_VCN_JPEG:

		*out_ring = &adev->vcn.ring_jpeg;

		break;

	default:

	default:

		*out_ring = NULL;

		*out_ring = NULL;

		DRM_ERROR("unknown HW IP type: %d\n", mapper->hw_ip);

		DRM_ERROR("unknown HW IP type: %d\n", mapper->hw_ip);
@@ -260,6 +263,9 @@ int amdgpu_queue_mgr_map(struct amdgpu_device *adev, 
	case AMDGPU_HW_IP_VCN_ENC:

	case AMDGPU_HW_IP_VCN_ENC:

		ip_num_rings = adev->vcn.num_enc_rings;

		ip_num_rings = adev->vcn.num_enc_rings;

		break;

		break;

	case AMDGPU_HW_IP_VCN_JPEG:

		ip_num_rings = 1;

		break;

	default:

	default:

		DRM_DEBUG("unknown ip type: %d\n", hw_ip);

		DRM_DEBUG("unknown ip type: %d\n", hw_ip);

		return -EINVAL;

		return -EINVAL;
@@ -287,6 +293,7 @@ int amdgpu_queue_mgr_map(struct amdgpu_device *adev, 
	case AMDGPU_HW_IP_UVD_ENC:

	case AMDGPU_HW_IP_UVD_ENC:

	case AMDGPU_HW_IP_VCN_DEC:

	case AMDGPU_HW_IP_VCN_DEC:

	case AMDGPU_HW_IP_VCN_ENC:

	case AMDGPU_HW_IP_VCN_ENC:

	case AMDGPU_HW_IP_VCN_JPEG:

		r = amdgpu_identity_map(adev, mapper, ring, out_ring);

		r = amdgpu_identity_map(adev, mapper, ring, out_ring);

		break;

		break;

	case AMDGPU_HW_IP_DMA:

	case AMDGPU_HW_IP_DMA: