Commit 5e709562 authored by Andres Rodriguez's avatar Andres Rodriguez Committed by Alex Deucher
Browse files

drm/amdgpu: remove duplicate magic constants from amdgpu_amdkfd_gfx*.c 



This information is already available in adev.

Reviewed-by: default avatarEdward O'Callaghan <funfunctor@folklore1984.net>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAndres Rodriguez <andresx7@gmail.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d0b63bb3

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

+6 −6
Original line number Diff line number Diff line
@@ -39,8 +39,6 @@ 
#include "gmc/gmc_7_1_sh_mask.h"

#include "cik_structs.h"



#define CIK_PIPE_PER_MEC	(4)



enum {

	MAX_TRAPID = 8,		/* 3 bits in the bitfield. */

	MAX_WATCH_ADDRESSES = 4
@@ -186,8 +184,10 @@ static void unlock_srbm(struct kgd_dev *kgd) 
static void acquire_queue(struct kgd_dev *kgd, uint32_t pipe_id,

				uint32_t queue_id)

{

	uint32_t mec = (++pipe_id / CIK_PIPE_PER_MEC) + 1;

	uint32_t pipe = (pipe_id % CIK_PIPE_PER_MEC);

	struct amdgpu_device *adev = get_amdgpu_device(kgd);



	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);

}
@@ -254,8 +254,8 @@ static int kgd_init_interrupts(struct kgd_dev *kgd, uint32_t pipe_id) 
	uint32_t mec;

	uint32_t pipe;



	mec = (pipe_id / CIK_PIPE_PER_MEC) + 1;

	pipe = (pipe_id % CIK_PIPE_PER_MEC);

	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);

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

+6 −6
Original line number Diff line number Diff line
@@ -39,8 +39,6 @@ 
#include "vi_structs.h"

#include "vid.h"



#define VI_PIPE_PER_MEC	(4)



struct cik_sdma_rlc_registers;



/*
@@ -147,8 +145,10 @@ static void unlock_srbm(struct kgd_dev *kgd) 
static void acquire_queue(struct kgd_dev *kgd, uint32_t pipe_id,

				uint32_t queue_id)

{

	uint32_t mec = (++pipe_id / VI_PIPE_PER_MEC) + 1;

	uint32_t pipe = (pipe_id % VI_PIPE_PER_MEC);

	struct amdgpu_device *adev = get_amdgpu_device(kgd);



	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,8 +216,8 @@ static int kgd_init_interrupts(struct kgd_dev *kgd, uint32_t pipe_id) 
	uint32_t mec;

	uint32_t pipe;



	mec = (++pipe_id / VI_PIPE_PER_MEC) + 1;

	pipe = (pipe_id % VI_PIPE_PER_MEC);

	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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE