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

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

drm/amdgpu: initialize vcn jpeg ring 



Add implementations for vcn jpeg ring initialization

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 59dd2b88

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

+23 −0
Original line number Diff line number Diff line
@@ -115,6 +115,12 @@ static int vcn_v1_0_sw_init(void *handle) 
			return r;

	}



	ring = &adev->vcn.ring_jpeg;

	sprintf(ring->name, "vcn_jpeg");

	r = amdgpu_ring_init(adev, ring, 512, &adev->vcn.irq, 0);

	if (r)

		return r;



	return r;

}
@@ -169,6 +175,14 @@ static int vcn_v1_0_hw_init(void *handle) 
		}

	}



	ring = &adev->vcn.ring_jpeg;

	ring->ready = true;

	r = amdgpu_ring_test_ring(ring);

	if (r) {

		ring->ready = false;

		goto done;

	}



done:

	if (!r)

		DRM_INFO("VCN decode and encode initialized successfully.\n");
@@ -736,6 +750,15 @@ static int vcn_v1_0_start(struct amdgpu_device *adev) 
	WREG32_SOC15(UVD, 0, mmUVD_RB_BASE_HI2, upper_32_bits(ring->gpu_addr));

	WREG32_SOC15(UVD, 0, mmUVD_RB_SIZE2, ring->ring_size / 4);



	ring = &adev->vcn.ring_jpeg;

	WREG32_SOC15(UVD, 0, mmUVD_LMI_JRBC_RB_VMID, 0);

	WREG32_SOC15(UVD, 0, mmUVD_JRBC_RB_CNTL, (0x00000001L | 0x00000002L));

	WREG32_SOC15(UVD, 0, mmUVD_LMI_JRBC_RB_64BIT_BAR_LOW, lower_32_bits(ring->gpu_addr));

	WREG32_SOC15(UVD, 0, mmUVD_LMI_JRBC_RB_64BIT_BAR_HIGH, upper_32_bits(ring->gpu_addr));

	WREG32_SOC15(UVD, 0, mmUVD_JRBC_RB_RPTR, 0);

	WREG32_SOC15(UVD, 0, mmUVD_JRBC_RB_WPTR, 0);

	WREG32_SOC15(UVD, 0, mmUVD_JRBC_RB_CNTL, 0x00000002L);



	return 0;

}