From f73dfcf7e1b453dd210cbc380e9caa66746ff643 Mon Sep 17 00:00:00 2001 From: Vedashree Vidwans Date: Mon, 10 Feb 2020 10:40:02 -0800 Subject: [PATCH] gpu: nvgpu: add engine_status_info for nvgpu-next Update engine_status_info for nvgpu-next. JIRA NVGPU-4972 Change-Id: I89241a1ef165886eba3b7f504656855afa1fa979 Signed-off-by: Vedashree Vidwans Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2292687 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Seema Khowala Reviewed-by: Vinod Gopalakrishnakurup Reviewed-by: mobile promotions GVS: Gerrit_Virtual_Submit Tested-by: mobile promotions --- drivers/gpu/nvgpu/include/nvgpu/engine_status.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/nvgpu/include/nvgpu/engine_status.h b/drivers/gpu/nvgpu/include/nvgpu/engine_status.h index 22918c157..da24b4131 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/engine_status.h +++ b/drivers/gpu/nvgpu/include/nvgpu/engine_status.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2019-2020, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -22,6 +22,11 @@ #ifndef NVGPU_ENGINE_STATUS_H #define NVGPU_ENGINE_STATUS_H + +#if defined(CONFIG_NVGPU_NON_FUSA) && defined(CONFIG_NVGPU_NEXT) +#include "include/nvgpu/nvgpu_next_engine_status.h" +#endif + /** * @file * @@ -91,6 +96,12 @@ enum nvgpu_engine_status_ctx_status { struct nvgpu_engine_status_info { /** Engine status h/w register's read value. */ u32 reg_data; + /** @cond DOXYGEN_SHOULD_SKIP_THIS */ +#if defined(CONFIG_NVGPU_NON_FUSA) && defined(CONFIG_NVGPU_NEXT) + /* nvgpu next engine status additions */ + struct nvgpu_next_engine_status_info nvgpu_next; +#endif + /** @endcond DOXYGEN_SHOULD_SKIP_THIS */ /** Channel or tsg id that is currently assigned to the engine. */ u32 ctx_id; /** Ctx_status field of engine_status h/w register. */