[Mesa-dev] [PATCH] anv: remove anv_gem_set_context_priority helper

Tapani Pälli tapani.palli at intel.com
Wed Feb 28 17:13:07 UTC 2018


anv_gem_set_context_param is to be used directly instead!

Fixes: 6d8ab53303 "anv: implement VK_EXT_global_priority extension"
Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
---
 src/intel/vulkan/anv_device.c  | 5 +++--
 src/intel/vulkan/anv_gem.c     | 9 ---------
 src/intel/vulkan/anv_private.h | 1 -
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index f314d7667d..56c0c5fa9f 100644
--- a/src/intel/vulkan/anv_device.c
+++ b/src/intel/vulkan/anv_device.c
@@ -1433,8 +1433,9 @@ VkResult anv_CreateDevice(
     * is returned.
     */
    if (physical_device->has_context_priority) {
-      int err =
-         anv_gem_set_context_priority(device, vk_priority_to_gen(priority));
+      int err = anv_gem_set_context_param(device->fd, device->context_id,
+                                          I915_CONTEXT_PARAM_PRIORITY,
+                                          vk_priority_to_gen(priority));
       if (err != 0 && priority > VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_EXT) {
          result = vk_error(VK_ERROR_NOT_PERMITTED_EXT);
          goto fail_fd;
diff --git a/src/intel/vulkan/anv_gem.c b/src/intel/vulkan/anv_gem.c
index 93072c7d3b..2a8f8b14b7 100644
--- a/src/intel/vulkan/anv_gem.c
+++ b/src/intel/vulkan/anv_gem.c
@@ -303,15 +303,6 @@ close_and_return:
    return swizzled;
 }
 
-int
-anv_gem_set_context_priority(struct anv_device *device,
-                             int priority)
-{
-   return anv_gem_set_context_param(device->fd, device->context_id,
-                                    I915_CONTEXT_PARAM_PRIORITY,
-                                    priority);
-}
-
 bool
 anv_gem_has_context_priority(int fd)
 {
diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
index 3a4a80d869..a6863f5532 100644
--- a/src/intel/vulkan/anv_private.h
+++ b/src/intel/vulkan/anv_private.h
@@ -925,7 +925,6 @@ int anv_gem_set_tiling(struct anv_device *device, uint32_t gem_handle,
                        uint32_t stride, uint32_t tiling);
 int anv_gem_create_context(struct anv_device *device);
 bool anv_gem_has_context_priority(int fd);
-int anv_gem_set_context_priority(struct anv_device *device, int priority);
 int anv_gem_destroy_context(struct anv_device *device, int context);
 int anv_gem_set_context_param(int fd, int context, uint32_t param,
                               uint64_t value);
-- 
2.13.6



More information about the mesa-dev mailing list