From ec39f62ee1b5935fc85ca3431b0494207ca3b6d3 Mon Sep 17 00:00:00 2001
From: Rahul Garg <rahul.garg@amd.com>
Date: Mon, 2 Aug 2021 18:48:15 +0000
Subject: [PATCH] SWDEV-297563 - Move surface types

Change-Id: Ie2393fb32a30a76c39c81ce17497fa3b131a85b1
---
 .../hip/amd_detail/amd_hip_surface_types.h    | 54 -------------------
 .../hip/amd_detail/amd_surface_functions.h    |  2 +-
 hipamd/src/hip_surface.cpp                    |  2 +-
 3 files changed, 2 insertions(+), 56 deletions(-)
 delete mode 100644 hipamd/include/hip/amd_detail/amd_hip_surface_types.h

diff --git a/hipamd/include/hip/amd_detail/amd_hip_surface_types.h b/hipamd/include/hip/amd_detail/amd_hip_surface_types.h
deleted file mode 100644
index d9755b3ec9..0000000000
--- a/hipamd/include/hip/amd_detail/amd_hip_surface_types.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. 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"), 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
-AUTHORS OR COPYRIGHT HOLDERS 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.
-*/
-
-/**
- *  @file  amd_detail/hip_surface_types.h
- *  @brief Defines surface types for HIP runtime.
- */
-
-#ifndef HIP_INCLUDE_HIP_AMD_DETAIL_HIP_SURFACE_TYPES_H
-#define HIP_INCLUDE_HIP_AMD_DETAIL_HIP_SURFACE_TYPES_H
-
-#include <hip/driver_types.h>
-
-/**
- * An opaque value that represents a hip surface object
- */
-typedef unsigned long long hipSurfaceObject_t;
-
-/**
- * hip surface reference
- */
-struct surfaceReference {
-    hipSurfaceObject_t surfaceObject;
-};
-
-/**
- * hip surface boundary modes
- */
-enum hipSurfaceBoundaryMode {
-    hipBoundaryModeZero = 0,
-    hipBoundaryModeTrap = 1,
-    hipBoundaryModeClamp = 2
-};
-
-#endif /* !HIP_INCLUDE_HIP_AMD_DETAIL_HIP_SURFACE_TYPES_H */
diff --git a/hipamd/include/hip/amd_detail/amd_surface_functions.h b/hipamd/include/hip/amd_detail/amd_surface_functions.h
index 4ec1f50292..ee6e77769a 100644
--- a/hipamd/include/hip/amd_detail/amd_surface_functions.h
+++ b/hipamd/include/hip/amd_detail/amd_surface_functions.h
@@ -23,7 +23,7 @@ THE SOFTWARE.
 #ifndef HIP_INCLUDE_HIP_AMD_DETAIL_SURFACE_FUNCTIONS_H
 #define HIP_INCLUDE_HIP_AMD_DETAIL_SURFACE_FUNCTIONS_H
 
-#include <hip/amd_detail/amd_hip_surface_types.h>
+#include <hip/surface_types.h>
 
 #define __SURFACE_FUNCTIONS_DECL__ static inline __device__
 template <class T>
diff --git a/hipamd/src/hip_surface.cpp b/hipamd/src/hip_surface.cpp
index 2b7f2050a2..47c988f1c2 100644
--- a/hipamd/src/hip_surface.cpp
+++ b/hipamd/src/hip_surface.cpp
@@ -21,7 +21,7 @@
 #include <hip/hip_runtime.h>
 
 #include "hip_internal.hpp"
-#include <hip/amd_detail/amd_hip_surface_types.h>
+#include <hip/surface_types.h>
 
 hipError_t hipCreateSurfaceObject(hipSurfaceObject_t* pSurfObject,
                                   const hipResourceDesc* pResDesc) {