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

- Add the interrupts & events modules, including new IOCTLs to create and wait
  on events. The HSA RT open source stack is mainly using events to know when
  a dispatched work has been completed. In addition, this module is
  a pre-requisite for the next module I'm going to upstream - debugger support

  This module also handles H/W exceptions, such as memory exception received
  through the IOMMUv2 H/W and Bad Opcode exception receieved from the GPU.

- Adding a new kernel module parameter to let the user decide whether he wants
  to receive a SIGTERM when a memory exception occurs inside the GPU kernel and
  the HSA application doesn't wait on an appropriate event, or if he just want
  to receive notification about this event in dmesg. The default is the latter.

- Additional improvements for SDMA code

- Update my email address in Maintainers file.

* tag 'drm-amdkfd-next-2015-05-19' of git://people.freedesktop.org/~gabbayo/linux:
  drm/amdkfd: change driver version to 0.7.2
  drm/amdkfd: Implement events IOCTLs
  drm/amdkfd: Add module parameter of send_sigterm
  drm/amdkfd: Add bad opcode exception handling
  drm/amdkfd: Add memory exception handling
  drm/amdkfd: Add the events module
  drm/amdkfd: add events IOCTL set definitions
  drm/amdkfd: Add interrupt handling module
  drm/radeon: Add init interrupt kfd->kgd interface
  MAINTAINERS: update amdkfd Oded's email address
  drm/amdkfd: make the sdma vm init to be asic specific
  drm/amdkfd: Use new struct for asic specific ops
  drm/amdkfd: reformat some debug prints
  drm/amdkfd: Remove unessary void pointer cast

1 files changed, 94 insertions, 2 deletions

diff --git a/include/uapi/linux/kfd_ioctl.h b/include/uapi/linux/kfd_ioctl.h
index af94f31e33ac..4ca35a8f9891 100644
--- a/include/uapi/linux/kfd_ioctl.h
+++ b/include/uapi/linux/kfd_ioctl.h
@@ -27,7 +27,7 @@
 #include <linux/ioctl.h>
 
 #define KFD_IOCTL_MAJOR_VERSION 1
-#define KFD_IOCTL_MINOR_VERSION 0
+#define KFD_IOCTL_MINOR_VERSION 1
 
 struct kfd_ioctl_get_version_args {
         uint32_t major_version; /* from KFD */
@@ -128,6 +128,83 @@ struct kfd_ioctl_get_process_apertures_args {
         uint32_t pad;
 };
 
+/* Matching HSA_EVENTTYPE */
+#define KFD_IOC_EVENT_SIGNAL                    0
+#define KFD_IOC_EVENT_NODECHANGE                1
+#define KFD_IOC_EVENT_DEVICESTATECHANGE         2
+#define KFD_IOC_EVENT_HW_EXCEPTION              3
+#define KFD_IOC_EVENT_SYSTEM_EVENT              4
+#define KFD_IOC_EVENT_DEBUG_EVENT               5
+#define KFD_IOC_EVENT_PROFILE_EVENT             6
+#define KFD_IOC_EVENT_QUEUE_EVENT               7
+#define KFD_IOC_EVENT_MEMORY                    8
+
+#define KFD_IOC_WAIT_RESULT_COMPLETE            0
+#define KFD_IOC_WAIT_RESULT_TIMEOUT             1
+#define KFD_IOC_WAIT_RESULT_FAIL                2
+
+#define KFD_SIGNAL_EVENT_LIMIT                  256
+
+struct kfd_ioctl_create_event_args {
+        uint64_t event_page_offset;     /* from KFD */
+        uint32_t event_trigger_data;    /* from KFD - signal events only */
+        uint32_t event_type;            /* to KFD */
+        uint32_t auto_reset;            /* to KFD */
+        uint32_t node_id;               /* to KFD - only valid for certain
+                                                        event types */
+        uint32_t event_id;              /* from KFD */
+        uint32_t event_slot_index;      /* from KFD */
+};
+
+struct kfd_ioctl_destroy_event_args {
+        uint32_t event_id;              /* to KFD */
+        uint32_t pad;
+};
+
+struct kfd_ioctl_set_event_args {
+        uint32_t event_id;              /* to KFD */
+        uint32_t pad;
+};
+
+struct kfd_ioctl_reset_event_args {
+        uint32_t event_id;              /* to KFD */
+        uint32_t pad;
+};
+
+struct kfd_memory_exception_failure {
+        uint32_t NotPresent;    /* Page not present or supervisor privilege */
+        uint32_t ReadOnly;      /* Write access to a read-only page */
+        uint32_t NoExecute;     /* Execute access to a page marked NX */
+        uint32_t pad;
+};
+
+/* memory exception data*/
+struct kfd_hsa_memory_exception_data {
+        struct kfd_memory_exception_failure failure;
+        uint64_t va;
+        uint32_t gpu_id;
+        uint32_t pad;
+};
+
+/* Event data*/
+struct kfd_event_data {
+        union {
+                struct kfd_hsa_memory_exception_data memory_exception_data;
+        };                              /* From KFD */
+        uint64_t kfd_event_data_ext;    /* pointer to an extension structure
+                                           for future exception types */
+        uint32_t event_id;              /* to KFD */
+        uint32_t pad;
+};
+
+struct kfd_ioctl_wait_events_args {
+        uint64_t events_ptr;            /* to KFD */
+        uint32_t num_events;            /* to KFD */
+        uint32_t wait_for_all;          /* to KFD */
+        uint32_t timeout;               /* to KFD */
+        uint32_t wait_result;           /* from KFD */
+};
+
 #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)
@@ -155,7 +232,22 @@ struct kfd_ioctl_get_process_apertures_args {
 #define AMDKFD_IOC_UPDATE_QUEUE                 \
                 AMDKFD_IOW(0x07, struct kfd_ioctl_update_queue_args)
 
+#define AMDKFD_IOC_CREATE_EVENT                 \
+                AMDKFD_IOWR(0x08, struct kfd_ioctl_create_event_args)
+
+#define AMDKFD_IOC_DESTROY_EVENT                \
+                AMDKFD_IOW(0x09, struct kfd_ioctl_destroy_event_args)
+
+#define AMDKFD_IOC_SET_EVENT                    \
+                AMDKFD_IOW(0x0A, struct kfd_ioctl_set_event_args)
+
+#define AMDKFD_IOC_RESET_EVENT                  \
+                AMDKFD_IOW(0x0B, struct kfd_ioctl_reset_event_args)
+
+#define AMDKFD_IOC_WAIT_EVENTS                  \
+                AMDKFD_IOWR(0x0C, struct kfd_ioctl_wait_events_args)
+
 #define AMDKFD_COMMAND_START            0x01
-#define AMDKFD_COMMAND_END              0x08
+#define AMDKFD_COMMAND_END              0x0D
 
 #endif