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

Commit a104299b authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/amdkfd: Clean up inline handling 



- inline functions need to be static inline, otherwise gcc can opt to
  not inline and the linker gets unhappy.
- no forward decls for inline functions, just include the right headers.

Cc: Oded Gabbay <oded.gabbay@gmail.com>
Cc: Ben Goz <ben.goz@amd.com>
Reviewed-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1466500235-21282-2-git-send-email-daniel.vetter@ffwll.ch
parent 79190ea2

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h

+2 −2
Original line number Diff line number Diff line
@@ -187,12 +187,12 @@ int init_pipelines(struct device_queue_manager *dqm, 
unsigned int get_first_pipe(struct device_queue_manager *dqm);

unsigned int get_pipes_num(struct device_queue_manager *dqm);



extern inline unsigned int get_sh_mem_bases_32(struct kfd_process_device *pdd)

static inline unsigned int get_sh_mem_bases_32(struct kfd_process_device *pdd)

{

	return (pdd->lds_base >> 16) & 0xFF;

}



extern inline unsigned int

static inline unsigned int

get_sh_mem_bases_nybble_64(struct kfd_process_device *pdd)

{

	return (pdd->lds_base >> 60) & 0x0E;

drivers/gpu/drm/amd/amdkfd/kfd_priv.h

+0 −3
Original line number Diff line number Diff line
@@ -617,10 +617,7 @@ int kgd2kfd_resume(struct kfd_dev *kfd); 
int kfd_init_apertures(struct kfd_process *process);



/* Queue Context Management */

inline uint32_t lower_32(uint64_t x);

inline uint32_t upper_32(uint64_t x);

struct cik_sdma_rlc_registers *get_sdma_mqd(void *mqd);

inline uint32_t get_sdma_base_addr(struct cik_sdma_rlc_registers *m);



int init_queue(struct queue **q, struct queue_properties properties);

void uninit_queue(struct queue *q);