From fd93b9c476c157b88b2501c815bcb074b0408329 Mon Sep 17 00:00:00 2001
From: Vladislav Sytchenko <vladislav.sytchenko@amd.com>
Date: Thu, 20 Feb 2020 18:56:33 -0500
Subject: [PATCH] Report the HW requirments for pitch alignment

Change-Id: Iaaa9d597dff57cfad5d07d931f881aba1a5f98f1


[ROCm/hip commit: 5623c74c35fecde53e26920f4bf0e0663d48cdc7]
---
 projects/hip/vdi/hip_device.cpp         | 3 ++-
 projects/hip/vdi/hip_device_runtime.cpp | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/projects/hip/vdi/hip_device.cpp b/projects/hip/vdi/hip_device.cpp
index cbed60da46..d1df525877 100644
--- a/projects/hip/vdi/hip_device.cpp
+++ b/projects/hip/vdi/hip_device.cpp
@@ -207,7 +207,8 @@ hipError_t hipGetDeviceProperties ( hipDeviceProp_t* props, hipDevice_t device )
   deviceProps.hdpRegFlushCntl = nullptr;
 
   deviceProps.memPitch = info.maxMemAllocSize_;
-  deviceProps.textureAlignment = std::max(info.imageBaseAddressAlignment_, info.imagePitchAlignment_);
+  deviceProps.textureAlignment = info.imageBaseAddressAlignment_;
+  deviceProps.texturePitchAlignment = info.imagePitchAlignment_;
   deviceProps.kernelExecTimeoutEnabled = 0;
   deviceProps.ECCEnabled = info.errorCorrectionSupport_? 1:0;
 
diff --git a/projects/hip/vdi/hip_device_runtime.cpp b/projects/hip/vdi/hip_device_runtime.cpp
index 1f0478319e..be2093a8c8 100644
--- a/projects/hip/vdi/hip_device_runtime.cpp
+++ b/projects/hip/vdi/hip_device_runtime.cpp
@@ -269,6 +269,9 @@ hipError_t hipDeviceGetAttribute(int* pi, hipDeviceAttribute_t attr, int device)
   case hipDeviceAttributeTextureAlignment:
     *pi = prop.textureAlignment;
     break;
+  case hipDeviceAttributeTexturePitchAlignment:
+    *pi = prop.texturePitchAlignment;
+    break;
   case hipDeviceAttributeKernelExecTimeout:
     *pi = prop.kernelExecTimeoutEnabled;
     break;