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

Commit 4b62e697 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: user amdgpu_bo_create_kernel for the UVD BO 



Saves us some code.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent cdb7e8f2

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

+3 −28
Original line number Diff line number Diff line
@@ -201,39 +201,14 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev) 
	bo_size = AMDGPU_GPU_PAGE_ALIGN(le32_to_cpu(hdr->ucode_size_bytes) + 8)

		  +  AMDGPU_UVD_STACK_SIZE + AMDGPU_UVD_HEAP_SIZE

		  +  AMDGPU_UVD_SESSION_SIZE * adev->uvd.max_handles;

	r = amdgpu_bo_create(adev, bo_size, PAGE_SIZE, true,

			     AMDGPU_GEM_DOMAIN_VRAM,

			     AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED,

			     NULL, NULL, &adev->uvd.vcpu_bo);

	r = amdgpu_bo_create_kernel(adev, bo_size, PAGE_SIZE,

				    AMDGPU_GEM_DOMAIN_VRAM, &adev->uvd.vcpu_bo,

				    &adev->uvd.gpu_addr, &adev->uvd.cpu_addr);

	if (r) {

		dev_err(adev->dev, "(%d) failed to allocate UVD bo\n", r);

		return r;

	}



	r = amdgpu_bo_reserve(adev->uvd.vcpu_bo, false);

	if (r) {

		amdgpu_bo_unref(&adev->uvd.vcpu_bo);

		dev_err(adev->dev, "(%d) failed to reserve UVD bo\n", r);

		return r;

	}



	r = amdgpu_bo_pin(adev->uvd.vcpu_bo, AMDGPU_GEM_DOMAIN_VRAM,

			  &adev->uvd.gpu_addr);

	if (r) {

		amdgpu_bo_unreserve(adev->uvd.vcpu_bo);

		amdgpu_bo_unref(&adev->uvd.vcpu_bo);

		dev_err(adev->dev, "(%d) UVD bo pin failed\n", r);

		return r;

	}



	r = amdgpu_bo_kmap(adev->uvd.vcpu_bo, &adev->uvd.cpu_addr);

	if (r) {

		dev_err(adev->dev, "(%d) UVD map failed\n", r);

		return r;

	}



	amdgpu_bo_unreserve(adev->uvd.vcpu_bo);



	ring = &adev->uvd.ring;

	rq = &ring->sched.sched_rq[AMD_SCHED_PRIORITY_NORMAL];

	r = amd_sched_entity_init(&ring->sched, &adev->uvd.entity,