diff options
author | Oded Gabbay <oded.gabbay@amd.com> | 2014-12-29 13:34:32 +0200 |
---|---|---|
committer | Oded Gabbay <oded.gabbay@amd.com> | 2014-12-29 13:34:32 +0200 |
commit | 9f647b07ff9c355e7e9ff6fd82b82fb87187cfc6 (patch) | |
tree | 4f084244308e7f145343e81e86fde0e6b62138d9 | |
parent | 0ecaa965238131e0d91a356d81d757fb002e7924 (diff) |
Change names of IOCTLS
Signed-off-by: Oded Gabbay <oded.gabbay@amd.com>
-rw-r--r-- | include/linux/kfd_ioctl.h | 37 | ||||
-rw-r--r-- | src/fmm.c | 2 | ||||
-rw-r--r-- | src/memory.c | 2 | ||||
-rw-r--r-- | src/queues.c | 6 | ||||
-rw-r--r-- | src/time.c | 2 | ||||
-rw-r--r-- | src/version.c | 2 |
6 files changed, 29 insertions, 22 deletions
diff --git a/include/linux/kfd_ioctl.h b/include/linux/kfd_ioctl.h index 7acef41..af94f31 100644 --- a/include/linux/kfd_ioctl.h +++ b/include/linux/kfd_ioctl.h @@ -128,27 +128,34 @@ struct kfd_ioctl_get_process_apertures_args { uint32_t pad; }; -#define KFD_IOC_MAGIC 'K' +#define AMDKFD_IOCTL_BASE 'K' +#define AMDKFD_IO(nr) _IO(AMDKFD_IOCTL_BASE, nr) +#define AMDKFD_IOR(nr, type) _IOR(AMDKFD_IOCTL_BASE, nr, type) +#define AMDKFD_IOW(nr, type) _IOW(AMDKFD_IOCTL_BASE, nr, type) +#define AMDKFD_IOWR(nr, type) _IOWR(AMDKFD_IOCTL_BASE, nr, type) -#define KFD_IOC_GET_VERSION \ - _IOR(KFD_IOC_MAGIC, 1, struct kfd_ioctl_get_version_args) +#define AMDKFD_IOC_GET_VERSION \ + AMDKFD_IOR(0x01, struct kfd_ioctl_get_version_args) -#define KFD_IOC_CREATE_QUEUE \ - _IOWR(KFD_IOC_MAGIC, 2, struct kfd_ioctl_create_queue_args) +#define AMDKFD_IOC_CREATE_QUEUE \ + AMDKFD_IOWR(0x02, struct kfd_ioctl_create_queue_args) -#define KFD_IOC_DESTROY_QUEUE \ - _IOWR(KFD_IOC_MAGIC, 3, struct kfd_ioctl_destroy_queue_args) +#define AMDKFD_IOC_DESTROY_QUEUE \ + AMDKFD_IOWR(0x03, struct kfd_ioctl_destroy_queue_args) -#define KFD_IOC_SET_MEMORY_POLICY \ - _IOW(KFD_IOC_MAGIC, 4, struct kfd_ioctl_set_memory_policy_args) +#define AMDKFD_IOC_SET_MEMORY_POLICY \ + AMDKFD_IOW(0x04, struct kfd_ioctl_set_memory_policy_args) -#define KFD_IOC_GET_CLOCK_COUNTERS \ - _IOWR(KFD_IOC_MAGIC, 5, struct kfd_ioctl_get_clock_counters_args) +#define AMDKFD_IOC_GET_CLOCK_COUNTERS \ + AMDKFD_IOWR(0x05, struct kfd_ioctl_get_clock_counters_args) -#define KFD_IOC_GET_PROCESS_APERTURES \ - _IOR(KFD_IOC_MAGIC, 6, struct kfd_ioctl_get_process_apertures_args) +#define AMDKFD_IOC_GET_PROCESS_APERTURES \ + AMDKFD_IOR(0x06, struct kfd_ioctl_get_process_apertures_args) -#define KFD_IOC_UPDATE_QUEUE \ - _IOW(KFD_IOC_MAGIC, 7, struct kfd_ioctl_update_queue_args) +#define AMDKFD_IOC_UPDATE_QUEUE \ + AMDKFD_IOW(0x07, struct kfd_ioctl_update_queue_args) + +#define AMDKFD_COMMAND_START 0x01 +#define AMDKFD_COMMAND_END 0x08 #endif @@ -446,7 +446,7 @@ HSAKMT_STATUS fmm_init_process_apertures(){ struct kfd_ioctl_get_process_apertures_args args; uint8_t node_id; - if (0 == kfd_ioctl(KFD_IOC_GET_PROCESS_APERTURES, (void*)&args)){ + if (0 == kfd_ioctl(AMDKFD_IOC_GET_PROCESS_APERTURES, (void*)&args)){ for(node_id = 0; node_id < args.num_of_nodes; node_id++){ gpu_mem[node_id].gpu_id = args.process_apertures[node_id].gpu_id; gpu_mem[node_id].lds_aperture.base = PORT_UINT64_TO_VPTR(args.process_apertures[node_id].lds_base); diff --git a/src/memory.c b/src/memory.c index 37cb88f..0b73b52 100644 --- a/src/memory.c +++ b/src/memory.c @@ -68,7 +68,7 @@ hsaKmtSetMemoryPolicy( args.alternate_aperture_base = (uintptr_t)MemoryAddressAlternate; args.alternate_aperture_size = MemorySizeInBytes; - int err = kfd_ioctl(KFD_IOC_SET_MEMORY_POLICY, &args); + int err = kfd_ioctl(AMDKFD_IOC_SET_MEMORY_POLICY, &args); return (err == -1) ? HSAKMT_STATUS_ERROR : HSAKMT_STATUS_SUCCESS; } diff --git a/src/queues.c b/src/queues.c index 1292b20..be250a2 100644 --- a/src/queues.c +++ b/src/queues.c @@ -107,7 +107,7 @@ hsaKmtCreateQueue( args.queue_percentage = QueuePercentage; args.queue_priority = Priority; - err = kfd_ioctl(KFD_IOC_CREATE_QUEUE, &args); + err = kfd_ioctl(AMDKFD_IOC_CREATE_QUEUE, &args); if (err == -1) { @@ -166,7 +166,7 @@ hsaKmtUpdateQueue( arg.queue_percentage = QueuePercentage; arg.queue_priority = Priority; - int err = kfd_ioctl(KFD_IOC_UPDATE_QUEUE, &arg); + int err = kfd_ioctl(AMDKFD_IOC_UPDATE_QUEUE, &arg); if (err == -1) { return HSAKMT_STATUS_ERROR; @@ -193,7 +193,7 @@ hsaKmtDestroyQueue( args.queue_id = q->queue_id; - int err = kfd_ioctl(KFD_IOC_DESTROY_QUEUE, &args); + int err = kfd_ioctl(AMDKFD_IOC_DESTROY_QUEUE, &args); if (err == -1) { @@ -46,7 +46,7 @@ hsaKmtGetClockCounters( args.gpu_id = gpu_id; - err = kfd_ioctl(KFD_IOC_GET_CLOCK_COUNTERS, &args); + err = kfd_ioctl(AMDKFD_IOC_GET_CLOCK_COUNTERS, &args); if (err < 0) { result = HSAKMT_STATUS_ERROR; } else { diff --git a/src/version.c b/src/version.c index 7d927c2..8908b17 100644 --- a/src/version.c +++ b/src/version.c @@ -39,7 +39,7 @@ hsaKmtGetVersion( struct kfd_ioctl_get_version_args args; memset(&args, 0, sizeof(args)); - if (kfd_ioctl(KFD_IOC_GET_VERSION, &args) == -1) + if (kfd_ioctl(AMDKFD_IOC_GET_VERSION, &args) == -1) return HSAKMT_STATUS_ERROR; VersionInfo->KernelInterfaceMajorVersion = args.major_version; |