From 0818d18d489940e0c2fc73959b16c8f242a7616a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Date: Fri, 17 Mar 2023 09:24:51 -0700 Subject: [PATCH] anv: Replace I915_ENGINE_CLASS_VIDEO by INTEL_ENGINE_CLASS_VIDEO MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Using the value that is not dependent on the KMD uapi. Not marking as a fixes because both have the same value, so we don't need a backport. Signed-off-by: José Roberto de Souza Reviewed-by: Lionel Landwerlin Part-of: --- src/intel/vulkan/anv_device.c | 4 ++-- src/intel/vulkan/genX_state.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index 8fc63c3..b457b54 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -729,7 +729,7 @@ anv_physical_device_init_queue_families(struct anv_physical_device *pdevice) intel_engines_count(pdevice->engine_info, INTEL_ENGINE_CLASS_RENDER); int v_count = - intel_engines_count(pdevice->engine_info, I915_ENGINE_CLASS_VIDEO); + intel_engines_count(pdevice->engine_info, INTEL_ENGINE_CLASS_VIDEO); int g_count = 0; int c_count = 0; if (debug_get_bool_option("INTEL_COMPUTE_CLASS", false)) @@ -769,7 +769,7 @@ anv_physical_device_init_queue_families(struct anv_physical_device *pdevice) pdevice->queue.families[family_count++] = (struct anv_queue_family) { .queueFlags = VK_QUEUE_VIDEO_DECODE_BIT_KHR, .queueCount = v_count, - .engine_class = I915_ENGINE_CLASS_VIDEO, + .engine_class = INTEL_ENGINE_CLASS_VIDEO, }; } /* Increase count below when other families are added as a reminder to diff --git a/src/intel/vulkan/genX_state.c b/src/intel/vulkan/genX_state.c index 93e16e9..2639b9d 100644 --- a/src/intel/vulkan/genX_state.c +++ b/src/intel/vulkan/genX_state.c @@ -545,7 +545,7 @@ genX(init_device_state)(struct anv_device *device) case INTEL_ENGINE_CLASS_COMPUTE: res = init_compute_queue_state(queue); break; - case I915_ENGINE_CLASS_VIDEO: + case INTEL_ENGINE_CLASS_VIDEO: res = VK_SUCCESS; break; default: -- 2.7.4