From 2b7599dc495669a9f935dcb80e5b62a100a9b788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Date: Thu, 27 Jul 2023 12:15:57 -0700 Subject: [PATCH] intel: Rename intel_gem_add_ext() to intel_i915_gem_add_ext() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gem_add_ext() is i915 specific so adding it to the name. Signed-off-by: José Roberto de Souza Reviewed-by: Marcin Ślusarz Part-of: --- .../drivers/iris/i915/iris_kmd_backend.c | 18 +++++------ src/intel/common/i915/intel_gem.c | 30 +++++++++---------- src/intel/common/i915/intel_gem.h | 2 +- src/intel/vulkan/i915/anv_kmd_backend.c | 6 ++-- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/gallium/drivers/iris/i915/iris_kmd_backend.c b/src/gallium/drivers/iris/i915/iris_kmd_backend.c index e79e942c5d3..d2b8c482010 100644 --- a/src/gallium/drivers/iris/i915/iris_kmd_backend.c +++ b/src/gallium/drivers/iris/i915/iris_kmd_backend.c @@ -75,9 +75,9 @@ i915_gem_create(struct iris_bufmgr *bufmgr, .num_regions = regions_count, .regions = (uintptr_t)i915_regions, }; - intel_gem_add_ext(&create.extensions, - I915_GEM_CREATE_EXT_MEMORY_REGIONS, - &ext_regions.base); + intel_i915_gem_add_ext(&create.extensions, + I915_GEM_CREATE_EXT_MEMORY_REGIONS, + &ext_regions.base); if (iris_bufmgr_vram_size(bufmgr) > 0 && !intel_vram_all_mappable(devinfo) && @@ -89,9 +89,9 @@ i915_gem_create(struct iris_bufmgr *bufmgr, .flags = 0, }; if (alloc_flags & BO_ALLOC_PROTECTED) { - intel_gem_add_ext(&create.extensions, - I915_GEM_CREATE_EXT_PROTECTED_CONTENT, - &protected_param.base); + intel_i915_gem_add_ext(&create.extensions, + I915_GEM_CREATE_EXT_PROTECTED_CONTENT, + &protected_param.base); } /* Set PAT param */ @@ -99,9 +99,9 @@ i915_gem_create(struct iris_bufmgr *bufmgr, if (devinfo->has_set_pat_uapi) { set_pat_param.pat_index = iris_pat_index_for_bo_flags(devinfo, alloc_flags); - intel_gem_add_ext(&create.extensions, - I915_GEM_CREATE_EXT_SET_PAT, - &set_pat_param.base); + intel_i915_gem_add_ext(&create.extensions, + I915_GEM_CREATE_EXT_SET_PAT, + &set_pat_param.base); } if (intel_ioctl(iris_bufmgr_get_fd(bufmgr), DRM_IOCTL_I915_GEM_CREATE_EXT, diff --git a/src/intel/common/i915/intel_gem.c b/src/intel/common/i915/intel_gem.c index 797b85b610d..2b37ef75294 100644 --- a/src/intel/common/i915/intel_gem.c +++ b/src/intel/common/i915/intel_gem.c @@ -138,17 +138,17 @@ i915_gem_create_context_engines(int fd, .flags = I915_CONTEXT_CREATE_FLAGS_USE_EXTENSIONS, }; - intel_gem_add_ext(&create.extensions, - I915_CONTEXT_CREATE_EXT_SETPARAM, - &set_engines.base); - intel_gem_add_ext(&create.extensions, - I915_CONTEXT_CREATE_EXT_SETPARAM, - &recoverable_param.base); + intel_i915_gem_add_ext(&create.extensions, + I915_CONTEXT_CREATE_EXT_SETPARAM, + &set_engines.base); + intel_i915_gem_add_ext(&create.extensions, + I915_CONTEXT_CREATE_EXT_SETPARAM, + &recoverable_param.base); if (flags & INTEL_GEM_CREATE_CONTEXT_EXT_PROTECTED_FLAG) { - intel_gem_add_ext(&create.extensions, - I915_CONTEXT_CREATE_EXT_SETPARAM, - &protected_param.base); + intel_i915_gem_add_ext(&create.extensions, + I915_CONTEXT_CREATE_EXT_SETPARAM, + &protected_param.base); } if (intel_ioctl(fd, DRM_IOCTL_I915_GEM_CONTEXT_CREATE_EXT, &create) == -1) @@ -218,12 +218,12 @@ i915_gem_create_context_ext(int fd, .flags = I915_CONTEXT_CREATE_FLAGS_USE_EXTENSIONS, }; - intel_gem_add_ext(&create.extensions, - I915_CONTEXT_CREATE_EXT_SETPARAM, - &recoverable_param.base); - intel_gem_add_ext(&create.extensions, - I915_CONTEXT_CREATE_EXT_SETPARAM, - &protected_param.base); + intel_i915_gem_add_ext(&create.extensions, + I915_CONTEXT_CREATE_EXT_SETPARAM, + &recoverable_param.base); + intel_i915_gem_add_ext(&create.extensions, + I915_CONTEXT_CREATE_EXT_SETPARAM, + &protected_param.base); if (intel_ioctl(fd, DRM_IOCTL_I915_GEM_CONTEXT_CREATE_EXT, &create)) return false; diff --git a/src/intel/common/i915/intel_gem.h b/src/intel/common/i915/intel_gem.h index 24e2cc5ad22..f78ce38c645 100644 --- a/src/intel/common/i915/intel_gem.h +++ b/src/intel/common/i915/intel_gem.h @@ -125,7 +125,7 @@ intel_i915_query_alloc(int fd, uint64_t query_id, int32_t *query_length) } static inline void -intel_gem_add_ext(__u64 *ptr, uint32_t ext_name, +intel_i915_gem_add_ext(__u64 *ptr, uint32_t ext_name, struct i915_user_extension *ext) { __u64 *iter = ptr; diff --git a/src/intel/vulkan/i915/anv_kmd_backend.c b/src/intel/vulkan/i915/anv_kmd_backend.c index cdf55591a51..bcae3c8ac4c 100644 --- a/src/intel/vulkan/i915/anv_kmd_backend.c +++ b/src/intel/vulkan/i915/anv_kmd_backend.c @@ -85,9 +85,9 @@ i915_gem_create(struct anv_device *device, set_pat_param.pat_index = device->info->pat.scanout; else set_pat_param.pat_index = device->info->pat.writeback; - intel_gem_add_ext(&gem_create.extensions, - I915_GEM_CREATE_EXT_SET_PAT, - &set_pat_param.base); + intel_i915_gem_add_ext(&gem_create.extensions, + I915_GEM_CREATE_EXT_SET_PAT, + &set_pat_param.base); } if (intel_ioctl(device->fd, DRM_IOCTL_I915_GEM_CREATE_EXT, &gem_create))