intel: Move anv_gem_supports_syncobj_wait to common code.
This will let me use this in iris. We leave the existing anv function for anv_gem_stubs.c faking, but move the contents to a helper in a new src/intel/common/gen_gem.c file. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3802>
This commit is contained in:

committed by
Marge Bot

parent
07fb925ad8
commit
615270502c
@@ -18,6 +18,7 @@ COMMON_FILES = \
|
|||||||
common/gen_disasm.c \
|
common/gen_disasm.c \
|
||||||
common/gen_disasm.h \
|
common/gen_disasm.h \
|
||||||
common/gen_defines.h \
|
common/gen_defines.h \
|
||||||
|
common/gen_gem.c \
|
||||||
common/gen_gem.h \
|
common/gen_gem.h \
|
||||||
common/gen_guardband.h \
|
common/gen_guardband.h \
|
||||||
common/gen_l3_config.c \
|
common/gen_l3_config.c \
|
||||||
|
57
src/intel/common/gen_gem.c
Normal file
57
src/intel/common/gen_gem.c
Normal file
@@ -0,0 +1,57 @@
|
|||||||
|
/*
|
||||||
|
* Copyright © 2020 Intel Corporation
|
||||||
|
*
|
||||||
|
* 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "gen_gem.h"
|
||||||
|
#include "drm-uapi/i915_drm.h"
|
||||||
|
|
||||||
|
bool
|
||||||
|
gen_gem_supports_syncobj_wait(int fd)
|
||||||
|
{
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
struct drm_syncobj_create create = {
|
||||||
|
.flags = 0,
|
||||||
|
};
|
||||||
|
ret = gen_ioctl(fd, DRM_IOCTL_SYNCOBJ_CREATE, &create);
|
||||||
|
if (ret)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
uint32_t syncobj = create.handle;
|
||||||
|
|
||||||
|
struct drm_syncobj_wait wait = {
|
||||||
|
.handles = (uint64_t)(uintptr_t)&create,
|
||||||
|
.count_handles = 1,
|
||||||
|
.timeout_nsec = 0,
|
||||||
|
.flags = DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT,
|
||||||
|
};
|
||||||
|
ret = gen_ioctl(fd, DRM_IOCTL_SYNCOBJ_WAIT, &wait);
|
||||||
|
|
||||||
|
struct drm_syncobj_destroy destroy = {
|
||||||
|
.handle = syncobj,
|
||||||
|
};
|
||||||
|
gen_ioctl(fd, DRM_IOCTL_SYNCOBJ_DESTROY, &destroy);
|
||||||
|
|
||||||
|
/* If it timed out, then we have the ioctl and it supports the
|
||||||
|
* DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT flag.
|
||||||
|
*/
|
||||||
|
return ret == -1 && errno == ETIME;
|
||||||
|
}
|
@@ -25,6 +25,7 @@
|
|||||||
#define GEN_GEM_H
|
#define GEN_GEM_H
|
||||||
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
#include <stdbool.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
@@ -71,4 +72,6 @@ gen_ioctl(int fd, unsigned long request, void *arg)
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool gen_gem_supports_syncobj_wait(int fd);
|
||||||
|
|
||||||
#endif /* GEN_GEM_H */
|
#endif /* GEN_GEM_H */
|
||||||
|
@@ -30,6 +30,7 @@ files_libintel_common = files(
|
|||||||
'gen_decoder.h',
|
'gen_decoder.h',
|
||||||
'gen_disasm.c',
|
'gen_disasm.c',
|
||||||
'gen_disasm.h',
|
'gen_disasm.h',
|
||||||
|
'gen_gem.c',
|
||||||
'gen_gem.h',
|
'gen_gem.h',
|
||||||
'gen_guardband.h',
|
'gen_guardband.h',
|
||||||
'gen_l3_config.c',
|
'gen_l3_config.c',
|
||||||
|
@@ -572,34 +572,7 @@ anv_gem_syncobj_reset(struct anv_device *device, uint32_t handle)
|
|||||||
bool
|
bool
|
||||||
anv_gem_supports_syncobj_wait(int fd)
|
anv_gem_supports_syncobj_wait(int fd)
|
||||||
{
|
{
|
||||||
int ret;
|
return gen_gem_supports_syncobj_wait(fd);
|
||||||
|
|
||||||
struct drm_syncobj_create create = {
|
|
||||||
.flags = 0,
|
|
||||||
};
|
|
||||||
ret = gen_ioctl(fd, DRM_IOCTL_SYNCOBJ_CREATE, &create);
|
|
||||||
if (ret)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
uint32_t syncobj = create.handle;
|
|
||||||
|
|
||||||
struct drm_syncobj_wait wait = {
|
|
||||||
.handles = (uint64_t)(uintptr_t)&create,
|
|
||||||
.count_handles = 1,
|
|
||||||
.timeout_nsec = 0,
|
|
||||||
.flags = DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT,
|
|
||||||
};
|
|
||||||
ret = gen_ioctl(fd, DRM_IOCTL_SYNCOBJ_WAIT, &wait);
|
|
||||||
|
|
||||||
struct drm_syncobj_destroy destroy = {
|
|
||||||
.handle = syncobj,
|
|
||||||
};
|
|
||||||
gen_ioctl(fd, DRM_IOCTL_SYNCOBJ_DESTROY, &destroy);
|
|
||||||
|
|
||||||
/* If it timed out, then we have the ioctl and it supports the
|
|
||||||
* DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT flag.
|
|
||||||
*/
|
|
||||||
return ret == -1 && errno == ETIME;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
|
Reference in New Issue
Block a user