Commit 84ce6c48 authored by Yong Zhao's avatar Yong Zhao Committed by Alex Deucher
Browse files

drm/amdkfd: Merge CIK kernel queue functions into VI 



The only difference that CIK kernel queue functions are different from
VI is avoid allocating eop_mem. We can achieve that by using a if
condition.

Signed-off-by: default avatarYong Zhao <Yong.Zhao@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 472b36a2

drivers/gpu/drm/amd/amdkfd/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ AMDKFD_FILES := $(AMDKFD_PATH)/kfd_module.o \ 
		$(AMDKFD_PATH)/kfd_mqd_manager_v9.o \

		$(AMDKFD_PATH)/kfd_mqd_manager_v10.o \

		$(AMDKFD_PATH)/kfd_kernel_queue.o \

		$(AMDKFD_PATH)/kfd_kernel_queue_cik.o \

		$(AMDKFD_PATH)/kfd_kernel_queue_vi.o \

		$(AMDKFD_PATH)/kfd_kernel_queue_v9.o \

		$(AMDKFD_PATH)/kfd_packet_manager.o \

drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c

+2 −5
Original line number Diff line number Diff line
@@ -311,6 +311,8 @@ struct kernel_queue *kernel_queue_init(struct kfd_dev *dev, 
	kq->ops.rollback_packet = rollback_packet;



	switch (dev->device_info->asic_family) {

	case CHIP_KAVERI:

	case CHIP_HAWAII:

	case CHIP_CARRIZO:

	case CHIP_TONGA:

	case CHIP_FIJI:
@@ -321,11 +323,6 @@ struct kernel_queue *kernel_queue_init(struct kfd_dev *dev, 
		kernel_queue_init_vi(&kq->ops_asic_specific);

		break;



	case CHIP_KAVERI:

	case CHIP_HAWAII:

		kernel_queue_init_cik(&kq->ops_asic_specific);

		break;



	case CHIP_VEGA10:

	case CHIP_VEGA12:

	case CHIP_VEGA20:

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

+0 −1
Original line number Diff line number Diff line
@@ -99,7 +99,6 @@ struct kernel_queue { 
	struct list_head	list;

};



void kernel_queue_init_cik(struct kernel_queue_ops *ops);

void kernel_queue_init_vi(struct kernel_queue_ops *ops);

void kernel_queue_init_v9(struct kernel_queue_ops *ops);

drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_cik.c

deleted100644 → 0
+0 −53
Original line number Diff line number Diff line 
/*

 * Copyright 2014 Advanced Micro Devices, Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 */



#include "kfd_kernel_queue.h"



static bool initialize_cik(struct kernel_queue *kq, struct kfd_dev *dev,

			enum kfd_queue_type type, unsigned int queue_size);

static void uninitialize_cik(struct kernel_queue *kq);

static void submit_packet_cik(struct kernel_queue *kq);



void kernel_queue_init_cik(struct kernel_queue_ops *ops)

{

	ops->initialize = initialize_cik;

	ops->uninitialize = uninitialize_cik;

	ops->submit_packet = submit_packet_cik;

}



static bool initialize_cik(struct kernel_queue *kq, struct kfd_dev *dev,

			enum kfd_queue_type type, unsigned int queue_size)

{

	return true;

}



static void uninitialize_cik(struct kernel_queue *kq)

{

}



static void submit_packet_cik(struct kernel_queue *kq)

{

	*kq->wptr_kernel = kq->pending_wptr;

	write_kernel_doorbell(kq->queue->properties.doorbell_ptr,

				kq->pending_wptr);

}

drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c

+7 −0
Original line number Diff line number Diff line
@@ -43,6 +43,10 @@ static bool initialize_vi(struct kernel_queue *kq, struct kfd_dev *dev, 
{

	int retval;



	/*For CIK family asics, kq->eop_mem is not needed */

	if (dev->device_info->asic_family <= CHIP_MULLINS)

		return true;



	retval = kfd_gtt_sa_allocate(dev, PAGE_SIZE, &kq->eop_mem);

	if (retval != 0)

		return false;
@@ -57,6 +61,9 @@ static bool initialize_vi(struct kernel_queue *kq, struct kfd_dev *dev, 


static void uninitialize_vi(struct kernel_queue *kq)

{

	/* For CIK family asics, kq->eop_mem is Null, kfd_gtt_sa_free()

	 * is able to handle NULL properly.

	 */

	kfd_gtt_sa_free(kq->dev, kq->eop_mem);

}