OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv: pass the fd directly to anv_gem_reg_read()

Browse Source 
This allows its use without the need for an anv_device.

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/2797>
This commit is contained in:
Eric Engestrom
2019-05-15 11:20:06 +01:00
committed by Marge Bot
parent 6bf40c28c9
commit e27f311c85
4 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/intel/vulkan/anv_device.c
View File

@@ -4448,7 +4448,7 @@ VkResult anv_GetCalibratedTimestampsEXT(
for (d = 0; d < timestampCount; d++) { for (d = 0; d < timestampCount; d++) {
switch (pTimestampInfos[d].timeDomain) { switch (pTimestampInfos[d].timeDomain) {
case VK_TIME_DOMAIN_DEVICE_EXT: case VK_TIME_DOMAIN_DEVICE_EXT:
ret = anv_gem_reg_read(device, TIMESTAMP | 1, ret = anv_gem_reg_read(device->fd, TIMESTAMP | 1,
&pTimestamps[d]); &pTimestamps[d]);
if (ret != 0) { if (ret != 0) {

4
src/intel/vulkan/anv_gem.c
View File

@@ -436,13 +436,13 @@ anv_gem_fd_to_handle(struct anv_device *device, int fd)
} }
int int
anv_gem_reg_read(struct anv_device *device, uint32_t offset, uint64_t *result) anv_gem_reg_read(int fd, uint32_t offset, uint64_t *result)
{ {
struct drm_i915_reg_read args = { struct drm_i915_reg_read args = {
.offset = offset .offset = offset
}; };
int ret = gen_ioctl(device->fd, DRM_IOCTL_I915_REG_READ, &args); int ret = gen_ioctl(fd, DRM_IOCTL_I915_REG_READ, &args);
*result = args.val; *result = args.val;
return ret; return ret;

3
src/intel/vulkan/anv_gem_stubs.c
View File

@@ -242,8 +242,7 @@ anv_gem_syncobj_wait(struct anv_device *device,
} }
int int
anv_gem_reg_read(struct anv_device *device, anv_gem_reg_read(int fd, uint32_t offset, uint64_t *result)
uint32_t offset, uint64_t *result)
{ {
unreachable("Unused"); unreachable("Unused");
} }

3
src/intel/vulkan/anv_private.h
View File

@@ -1550,8 +1550,7 @@ bool anv_gem_get_bit6_swizzle(int fd, uint32_t tiling);
int anv_gem_gpu_get_reset_stats(struct anv_device *device, int anv_gem_gpu_get_reset_stats(struct anv_device *device,
uint32_t *active, uint32_t *pending); uint32_t *active, uint32_t *pending);
int anv_gem_handle_to_fd(struct anv_device *device, uint32_t gem_handle); int anv_gem_handle_to_fd(struct anv_device *device, uint32_t gem_handle);
int anv_gem_reg_read(struct anv_device *device, int anv_gem_reg_read(int fd, uint32_t offset, uint64_t *result);
uint32_t offset, uint64_t *result);
uint32_t anv_gem_fd_to_handle(struct anv_device *device, int fd); uint32_t anv_gem_fd_to_handle(struct anv_device *device, int fd);
int anv_gem_set_caching(struct anv_device *device, uint32_t gem_handle, uint32_t caching); int anv_gem_set_caching(struct anv_device *device, uint32_t gem_handle, uint32_t caching);
int anv_gem_set_domain(struct anv_device *device, uint32_t gem_handle, int anv_gem_set_domain(struct anv_device *device, uint32_t gem_handle,