Return error code from handleRemainingRequests

Change-Id: Iea47322546f86870720a7ede553a6dd45cb09908
Signed-off-by: Mateusz Hoppe <mateusz.hoppe@intel.com>
This commit is contained in:
Mateusz Hoppe
2019-03-19 16:04:18 +01:00
committed by sys_ocldev
parent ddfb8a3ded
commit 832c620dc1
3 changed files with 25 additions and 3 deletions

View File

@ -23,6 +23,7 @@ set(IGDRCL_SRCS_tests_os_interface_linux
${CMAKE_CURRENT_SOURCE_DIR}/drm_memory_manager_tests.h
${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/drm_memory_manager_allocate_in_device_pool_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/drm_mock.h
${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/drm_mock.cpp
${CMAKE_CURRENT_SOURCE_DIR}/drm_neo_create.cpp
${CMAKE_CURRENT_SOURCE_DIR}/drm_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_linux_tests.cpp

View File

@ -0,0 +1,12 @@
/*
* Copyright (C) 2019 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "unit_tests/os_interface/linux/drm_mock.h"
int DrmMock::handleRemainingRequests(unsigned long request, void *arg) {
return -1;
};

View File

@ -146,41 +146,50 @@ class DrmMock : public Drm {
if (request == DRM_IOCTL_I915_GEM_EXECBUFFER2) {
drm_i915_gem_execbuffer2 *execbuf = (drm_i915_gem_execbuffer2 *)arg;
this->execBuffer = *execbuf;
return 0;
}
if (request == DRM_IOCTL_I915_GEM_USERPTR) {
auto *userPtrParams = (drm_i915_gem_userptr *)arg;
userPtrParams->handle = returnHandle;
returnHandle++;
return 0;
}
if (request == DRM_IOCTL_I915_GEM_CREATE) {
auto *createParams = (drm_i915_gem_create *)arg;
this->createParamsSize = createParams->size;
this->createParamsHandle = createParams->handle = 1u;
return 0;
}
if (request == DRM_IOCTL_I915_GEM_SET_TILING) {
auto *setTilingParams = (drm_i915_gem_set_tiling *)arg;
setTilingMode = setTilingParams->tiling_mode;
setTilingHandle = setTilingParams->handle;
setTilingStride = setTilingParams->stride;
return 0;
}
if (request == DRM_IOCTL_PRIME_FD_TO_HANDLE) {
auto *primeToHandleParams = (drm_prime_handle *)arg;
//return BO
primeToHandleParams->handle = outputHandle;
inputFd = primeToHandleParams->fd;
return 0;
}
if (request == DRM_IOCTL_I915_GEM_GET_APERTURE) {
auto aperture = (drm_i915_gem_get_aperture *)arg;
aperture->aper_available_size = gpuMemSize;
aperture->aper_size = gpuMemSize;
return 0;
}
if (request == DRM_IOCTL_I915_GEM_MMAP) {
auto mmap_arg = static_cast<drm_i915_gem_mmap *>(arg);
mmap_arg->addr_ptr = reinterpret_cast<__u64>(lockedPtr);
return 0;
}
if (request == DRM_IOCTL_I915_GEM_WAIT) {
return 0;
}
handleRemainingRequests(request, arg);
return 0;
return handleRemainingRequests(request, arg);
}
void setSysFsDefaultGpuPath(const char *path) {
@ -257,7 +266,7 @@ class DrmMock : public Drm {
//DRM_IOCTL_I915_GEM_MMAP
uint64_t lockedPtr[4];
virtual void handleRemainingRequests(unsigned long request, void *arg){};
virtual int handleRemainingRequests(unsigned long request, void *arg);
private:
const char *sysFsDefaultGpuPathToRestore;