Commit 5da612fa authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-amdkfd-next-2015-07-20' of git://people.freedesktop.org/~gabbayo/linux into drm-next 

- Add Carrizo support for amdkfd, using the new amdgpu driver as the relevant
  kgd. The support includes interfaces with amdgpu both for gfx7 (Kaveri) and
  gfx8 (Carrizo). However, gfx7 interface is used for debugging purposes only,
  so amdkfd defaults to using radeon when Kaveri is installed.

I would like to note that no new IOCTLs are being introduced, and there is no
change in the current IOCTLs, as they are suited both for gfx7 and gfx8.

* tag 'drm-amdkfd-next-2015-07-20' of git://people.freedesktop.org/~gabbayo/linux:
  drm/amdkfd: Set correct doorbell packet type for Carrizo
  drm/amdkfd: Use generic defines in new amd headers
  drm/amdkfd: Implement create_map_queues() for Carrizo
  drm/amdkfd: fix runlist length calculation
  drm/amdkfd: Add support for VI in DQM
  drm/amdkfd: add support for VI in MQD manager
  drm/amdkfd: add CP HWS packet headers for VI
  drm/amdkfd: add supported CZ devices PCI IDs to amdkfd
  drm/amdkfd: Add dependency of DRM_AMDGPU to Kconfig
  drm/amdgpu: Add amdgpu <--> amdkfd gfx8 interface
  drm/amdgpu: add amdgpu <--> amdkfd gfx7 interface
  drm/amdgpu: Add H/W agnostic amdgpu <--> amdkfd interface
  drm/radeon: Modify kgd_engine_type enum to match CZ
parents 52721d9d 7639a8c4

MAINTAINERS

+5 −0
Original line number Diff line number Diff line
@@ -636,9 +636,14 @@ M: Oded Gabbay <oded.gabbay@gmail.com> 
L:	dri-devel@lists.freedesktop.org

T:	git git://people.freedesktop.org/~gabbayo/linux.git

S:	Supported

F:	drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c

F:	drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h

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

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

F:	drivers/gpu/drm/amd/amdkfd/

F:	drivers/gpu/drm/amd/include/cik_structs.h

F:	drivers/gpu/drm/amd/include/kgd_kfd_interface.h

F:	drivers/gpu/drm/amd/include/vi_structs.h

F:	drivers/gpu/drm/radeon/radeon_kfd.c

F:	drivers/gpu/drm/radeon/radeon_kfd.h

F:	include/uapi/linux/kfd_ioctl.h

drivers/gpu/drm/amd/amdgpu/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -71,6 +71,12 @@ amdgpu-y += \ 
	amdgpu_vce.o \

	vce_v3_0.o



# add amdkfd interfaces

amdgpu-y += \

	 amdgpu_amdkfd.o \

	 amdgpu_amdkfd_gfx_v7.o \

	 amdgpu_amdkfd_gfx_v8.o



amdgpu-$(CONFIG_COMPAT) += amdgpu_ioc32.o

amdgpu-$(CONFIG_VGA_SWITCHEROO) += amdgpu_atpx_handler.o

amdgpu-$(CONFIG_ACPI) += amdgpu_acpi.o

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+3 −0
Original line number Diff line number Diff line
@@ -2011,6 +2011,9 @@ struct amdgpu_device { 
	/* tracking pinned memory */

	u64 vram_pin_size;

	u64 gart_pin_size;



	/* amdkfd interface */

	struct kfd_dev          *kfd;

};



bool amdgpu_device_is_px(struct drm_device *dev);

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

0 → 100644
+267 −0
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 "amdgpu_amdkfd.h"

#include "amdgpu_family.h"

#include <drm/drmP.h>

#include "amdgpu.h"

#include <linux/module.h>



const struct kfd2kgd_calls *kfd2kgd;

const struct kgd2kfd_calls *kgd2kfd;

bool (*kgd2kfd_init_p)(unsigned, const struct kgd2kfd_calls**);



bool amdgpu_amdkfd_init(void)

{

#if defined(CONFIG_HSA_AMD_MODULE)

	bool (*kgd2kfd_init_p)(unsigned, const struct kgd2kfd_calls**);



	kgd2kfd_init_p = symbol_request(kgd2kfd_init);



	if (kgd2kfd_init_p == NULL)

		return false;

#endif

	return true;

}



bool amdgpu_amdkfd_load_interface(struct amdgpu_device *rdev)

{

#if defined(CONFIG_HSA_AMD_MODULE)

	bool (*kgd2kfd_init_p)(unsigned, const struct kgd2kfd_calls**);

#endif



	switch (rdev->asic_type) {

	case CHIP_KAVERI:

		kfd2kgd = amdgpu_amdkfd_gfx_7_get_functions();

		break;

	case CHIP_CARRIZO:

		kfd2kgd = amdgpu_amdkfd_gfx_8_0_get_functions();

		break;

	default:

		return false;

	}



#if defined(CONFIG_HSA_AMD_MODULE)

	kgd2kfd_init_p = symbol_request(kgd2kfd_init);



	if (kgd2kfd_init_p == NULL) {

		kfd2kgd = NULL;

		return false;

	}



	if (!kgd2kfd_init_p(KFD_INTERFACE_VERSION, &kgd2kfd)) {

		symbol_put(kgd2kfd_init);

		kfd2kgd = NULL;

		kgd2kfd = NULL;



		return false;

	}



	return true;

#elif defined(CONFIG_HSA_AMD)

	if (!kgd2kfd_init(KFD_INTERFACE_VERSION, &kgd2kfd)) {

		kfd2kgd = NULL;

		kgd2kfd = NULL;

		return false;

	}



	return true;

#else

	kfd2kgd = NULL;

	return false;

#endif

}



void amdgpu_amdkfd_fini(void)

{

	if (kgd2kfd) {

		kgd2kfd->exit();

		symbol_put(kgd2kfd_init);

	}

}



void amdgpu_amdkfd_device_probe(struct amdgpu_device *rdev)

{

	if (kgd2kfd)

		rdev->kfd = kgd2kfd->probe((struct kgd_dev *)rdev,

					rdev->pdev, kfd2kgd);

}



void amdgpu_amdkfd_device_init(struct amdgpu_device *rdev)

{

	if (rdev->kfd) {

		struct kgd2kfd_shared_resources gpu_resources = {

			.compute_vmid_bitmap = 0xFF00,



			.first_compute_pipe = 1,

			.compute_pipe_count = 4 - 1,

		};



		amdgpu_doorbell_get_kfd_info(rdev,

				&gpu_resources.doorbell_physical_address,

				&gpu_resources.doorbell_aperture_size,

				&gpu_resources.doorbell_start_offset);



		kgd2kfd->device_init(rdev->kfd, &gpu_resources);

	}

}



void amdgpu_amdkfd_device_fini(struct amdgpu_device *rdev)

{

	if (rdev->kfd) {

		kgd2kfd->device_exit(rdev->kfd);

		rdev->kfd = NULL;

	}

}



void amdgpu_amdkfd_interrupt(struct amdgpu_device *rdev,

		const void *ih_ring_entry)

{

	if (rdev->kfd)

		kgd2kfd->interrupt(rdev->kfd, ih_ring_entry);

}



void amdgpu_amdkfd_suspend(struct amdgpu_device *rdev)

{

	if (rdev->kfd)

		kgd2kfd->suspend(rdev->kfd);

}



int amdgpu_amdkfd_resume(struct amdgpu_device *rdev)

{

	int r = 0;



	if (rdev->kfd)

		r = kgd2kfd->resume(rdev->kfd);



	return r;

}



u32 pool_to_domain(enum kgd_memory_pool p)

{

	switch (p) {

	case KGD_POOL_FRAMEBUFFER: return AMDGPU_GEM_DOMAIN_VRAM;

	default: return AMDGPU_GEM_DOMAIN_GTT;

	}

}



int alloc_gtt_mem(struct kgd_dev *kgd, size_t size,

			void **mem_obj, uint64_t *gpu_addr,

			void **cpu_ptr)

{

	struct amdgpu_device *rdev = (struct amdgpu_device *)kgd;

	struct kgd_mem **mem = (struct kgd_mem **) mem_obj;

	int r;



	BUG_ON(kgd == NULL);

	BUG_ON(gpu_addr == NULL);

	BUG_ON(cpu_ptr == NULL);



	*mem = kmalloc(sizeof(struct kgd_mem), GFP_KERNEL);

	if ((*mem) == NULL)

		return -ENOMEM;



	r = amdgpu_bo_create(rdev, size, PAGE_SIZE, true, AMDGPU_GEM_DOMAIN_GTT,

			AMDGPU_GEM_CREATE_CPU_GTT_USWC, NULL, &(*mem)->bo);

	if (r) {

		dev_err(rdev->dev,

			"failed to allocate BO for amdkfd (%d)\n", r);

		return r;

	}



	/* map the buffer */

	r = amdgpu_bo_reserve((*mem)->bo, true);

	if (r) {

		dev_err(rdev->dev, "(%d) failed to reserve bo for amdkfd\n", r);

		goto allocate_mem_reserve_bo_failed;

	}



	r = amdgpu_bo_pin((*mem)->bo, AMDGPU_GEM_DOMAIN_GTT,

				&(*mem)->gpu_addr);

	if (r) {

		dev_err(rdev->dev, "(%d) failed to pin bo for amdkfd\n", r);

		goto allocate_mem_pin_bo_failed;

	}

	*gpu_addr = (*mem)->gpu_addr;



	r = amdgpu_bo_kmap((*mem)->bo, &(*mem)->cpu_ptr);

	if (r) {

		dev_err(rdev->dev,

			"(%d) failed to map bo to kernel for amdkfd\n", r);

		goto allocate_mem_kmap_bo_failed;

	}

	*cpu_ptr = (*mem)->cpu_ptr;



	amdgpu_bo_unreserve((*mem)->bo);



	return 0;



allocate_mem_kmap_bo_failed:

	amdgpu_bo_unpin((*mem)->bo);

allocate_mem_pin_bo_failed:

	amdgpu_bo_unreserve((*mem)->bo);

allocate_mem_reserve_bo_failed:

	amdgpu_bo_unref(&(*mem)->bo);



	return r;

}



void free_gtt_mem(struct kgd_dev *kgd, void *mem_obj)

{

	struct kgd_mem *mem = (struct kgd_mem *) mem_obj;



	BUG_ON(mem == NULL);



	amdgpu_bo_reserve(mem->bo, true);

	amdgpu_bo_kunmap(mem->bo);

	amdgpu_bo_unpin(mem->bo);

	amdgpu_bo_unreserve(mem->bo);

	amdgpu_bo_unref(&(mem->bo));

	kfree(mem);

}



uint64_t get_vmem_size(struct kgd_dev *kgd)

{

	struct amdgpu_device *rdev =

		(struct amdgpu_device *)kgd;



	BUG_ON(kgd == NULL);



	return rdev->mc.real_vram_size;

}



uint64_t get_gpu_clock_counter(struct kgd_dev *kgd)

{

	struct amdgpu_device *rdev = (struct amdgpu_device *)kgd;



	if (rdev->asic_funcs->get_gpu_clock_counter)

		return rdev->asic_funcs->get_gpu_clock_counter(rdev);

	return 0;

}



uint32_t get_max_engine_clock_in_mhz(struct kgd_dev *kgd)

{

	struct amdgpu_device *rdev = (struct amdgpu_device *)kgd;



	/* The sclk is in quantas of 10kHz */

	return rdev->pm.dpm.dyn_state.max_clock_voltage_on_ac.sclk / 100;

}

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h

0 → 100644
+65 −0
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.

 */



/* amdgpu_amdkfd.h defines the private interface between amdgpu and amdkfd. */



#ifndef AMDGPU_AMDKFD_H_INCLUDED

#define AMDGPU_AMDKFD_H_INCLUDED



#include <linux/types.h>

#include <kgd_kfd_interface.h>



struct amdgpu_device;



struct kgd_mem {

	struct amdgpu_bo *bo;

	uint64_t gpu_addr;

	void *cpu_ptr;

};



bool amdgpu_amdkfd_init(void);

void amdgpu_amdkfd_fini(void);



bool amdgpu_amdkfd_load_interface(struct amdgpu_device *rdev);



void amdgpu_amdkfd_suspend(struct amdgpu_device *rdev);

int amdgpu_amdkfd_resume(struct amdgpu_device *rdev);

void amdgpu_amdkfd_interrupt(struct amdgpu_device *rdev,

			const void *ih_ring_entry);

void amdgpu_amdkfd_device_probe(struct amdgpu_device *rdev);

void amdgpu_amdkfd_device_init(struct amdgpu_device *rdev);

void amdgpu_amdkfd_device_fini(struct amdgpu_device *rdev);



struct kfd2kgd_calls *amdgpu_amdkfd_gfx_7_get_functions(void);

struct kfd2kgd_calls *amdgpu_amdkfd_gfx_8_0_get_functions(void);



/* Shared API */

int alloc_gtt_mem(struct kgd_dev *kgd, size_t size,

			void **mem_obj, uint64_t *gpu_addr,

			void **cpu_ptr);

void free_gtt_mem(struct kgd_dev *kgd, void *mem_obj);

uint64_t get_vmem_size(struct kgd_dev *kgd);

uint64_t get_gpu_clock_counter(struct kgd_dev *kgd);



uint32_t get_max_engine_clock_in_mhz(struct kgd_dev *kgd);



#endif /* AMDGPU_AMDKFD_H_INCLUDED */

CRA Git | Maintained and supported by SUSTech CRA and CCSE