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

Commit 438e29a2 authored by Felix Kuehling's avatar Felix Kuehling Committed by Oded Gabbay
Browse files

drm/amdgpu: Remove hard-coded assumptions about compute pipes 



Remove hard-coded assumption that the first compute pipe is
reserved for amdgpu. Pipe 0 actually means pipe 0 now.

Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
parent 86194cf8

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

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ static void acquire_queue(struct kgd_dev *kgd, uint32_t pipe_id, 
{

	struct amdgpu_device *adev = get_amdgpu_device(kgd);



	uint32_t mec = (++pipe_id / adev->gfx.mec.num_pipe_per_mec) + 1;

	uint32_t mec = (pipe_id / adev->gfx.mec.num_pipe_per_mec) + 1;

	uint32_t pipe = (pipe_id % adev->gfx.mec.num_pipe_per_mec);



	lock_srbm(kgd, mec, pipe, queue_id, 0);

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

+2 −2
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ static void acquire_queue(struct kgd_dev *kgd, uint32_t pipe_id, 
{

	struct amdgpu_device *adev = get_amdgpu_device(kgd);



	uint32_t mec = (++pipe_id / adev->gfx.mec.num_pipe_per_mec) + 1;

	uint32_t mec = (pipe_id / adev->gfx.mec.num_pipe_per_mec) + 1;

	uint32_t pipe = (pipe_id % adev->gfx.mec.num_pipe_per_mec);



	lock_srbm(kgd, mec, pipe, queue_id, 0);
@@ -216,7 +216,7 @@ static int kgd_init_interrupts(struct kgd_dev *kgd, uint32_t pipe_id) 
	uint32_t mec;

	uint32_t pipe;



	mec = (++pipe_id / adev->gfx.mec.num_pipe_per_mec) + 1;

	mec = (pipe_id / adev->gfx.mec.num_pipe_per_mec) + 1;

	pipe = (pipe_id % adev->gfx.mec.num_pipe_per_mec);



	lock_srbm(kgd, mec, pipe, 0, 0);