summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorThomas Fleury <tfleury@nvidia.com>2016-11-18 12:11:45 -0500
committermobile promotions <svcmobile_promotions@nvidia.com>2016-12-15 13:15:02 -0500
commit68eeda3ebdd6ca20289fb0af22a0ca593198bc63 (patch)
tree0f2649409e3e191a233a2a979f0d594a3a603e41 /include
parentf2f06852c3ec6b1fe644707f03e1e2818cee1d27 (diff)
gpu: nvgpu: alarm/event interface cleanup
use CPU timestamp in nanoseconds define last event/alarm number Jira DNVGPU-186 Change-Id: I769c8a7a41ac1fb49234f0d5144a78fa657ec230 Signed-off-by: Thomas Fleury <tfleury@nvidia.com> Reviewed-on: http://git-master/r/1260799 (cherry picked from commit 379171b43cb20d7a31b3966cad3696525e8cf7d9) Reviewed-on: http://git-master/r/1267159 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'include')
-rw-r--r--include/uapi/linux/nvgpu.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/include/uapi/linux/nvgpu.h b/include/uapi/linux/nvgpu.h
index 4c4b0f8c..649cdf02 100644
--- a/include/uapi/linux/nvgpu.h
+++ b/include/uapi/linux/nvgpu.h
@@ -695,7 +695,7 @@ struct nvgpu_gpu_get_event_fd_args {
695 /* in: Flags (not currently used). */ 695 /* in: Flags (not currently used). */
696 __u32 flags; 696 __u32 flags;
697 697
698 /* out: File descriptor for events, i.e. clock update. 698 /* out: File descriptor for events, e.g. clock update.
699 * On successful polling of this event_fd, application is 699 * On successful polling of this event_fd, application is
700 * expected to read status (nvgpu_gpu_event_info), 700 * expected to read status (nvgpu_gpu_event_info),
701 * which provides detailed event information 701 * which provides detailed event information
@@ -873,14 +873,16 @@ struct nvgpu_gpu_get_temperature_args {
873/* Alarm on power condition */ 873/* Alarm on power condition */
874#define NVGPU_GPU_EVENT_ALARM_POWER_ABOVE_THRESHOLD 6 874#define NVGPU_GPU_EVENT_ALARM_POWER_ABOVE_THRESHOLD 6
875 875
876/* Non recoverable alarm (POLLUP) */ 876/* Non recoverable alarm (POLLHUP) */
877/* Alarm on GPU shutdown/fall from bus */ 877/* Alarm on GPU shutdown/fall from bus */
878#define NVGPU_GPU_EVENT_ALARM_GPU_LOST 7 878#define NVGPU_GPU_EVENT_ALARM_GPU_LOST 7
879 879
880#define NVGPU_GPU_EVENT_LAST NVGPU_GPU_EVENT_ALARM_GPU_LOST
881
880struct nvgpu_gpu_event_info { 882struct nvgpu_gpu_event_info {
881 __u32 event_id; /* NVGPU_GPU_EVENT_* */ 883 __u32 event_id; /* NVGPU_GPU_EVENT_* */
882 __u32 reserved; 884 __u32 reserved;
883 __u64 timestamp; /* GPU timestamp */ 885 __u64 timestamp; /* CPU timestamp (in nanoseconds) */
884}; 886};
885 887
886struct nvgpu_gpu_set_event_filter_args { 888struct nvgpu_gpu_set_event_filter_args {