From 1b61786ac7b31c4c455df8676b8067f684a68348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Date: Fri, 12 Jan 2024 10:50:58 -0800 Subject: [PATCH] intel: Move intel_define.h to i915/intel_define.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This file defines i915 context priorities, all users in Iris and ANV have moved to i915 specific files, so the only remaining for this file is move it to i915 folder so it do not gets included in common code by mistake. Reviewed-by: Lionel Landwerlin Signed-off-by: José Roberto de Souza Part-of: --- src/gallium/drivers/crocus/crocus_context.c | 2 +- src/gallium/drivers/iris/i915/iris_batch.c | 2 +- src/gallium/drivers/iris/iris_batch.c | 1 - src/intel/common/{ => i915}/intel_defines.h | 0 src/intel/vulkan/i915/anv_device.c | 2 +- src/intel/vulkan_hasvk/anv_device.c | 2 +- src/intel/vulkan_hasvk/anv_gem.c | 2 +- 7 files changed, 5 insertions(+), 6 deletions(-) rename src/intel/common/{ => i915}/intel_defines.h (100%) diff --git a/src/gallium/drivers/crocus/crocus_context.c b/src/gallium/drivers/crocus/crocus_context.c index a54148df9a1..e8d52b6e3ab 100644 --- a/src/gallium/drivers/crocus/crocus_context.c +++ b/src/gallium/drivers/crocus/crocus_context.c @@ -32,7 +32,7 @@ #include "crocus_context.h" #include "crocus_resource.h" #include "crocus_screen.h" -#include "common/intel_defines.h" +#include "common/i915/intel_defines.h" #include "common/intel_sample_positions.h" /** diff --git a/src/gallium/drivers/iris/i915/iris_batch.c b/src/gallium/drivers/iris/i915/iris_batch.c index c95f1ed6894..d9969deb8f2 100644 --- a/src/gallium/drivers/iris/i915/iris_batch.c +++ b/src/gallium/drivers/iris/i915/iris_batch.c @@ -25,7 +25,7 @@ #include "iris/iris_batch.h" #include "iris/iris_context.h" -#include "common/intel_defines.h" +#include "common/i915/intel_defines.h" #include "common/intel_gem.h" #include "util/u_debug.h" diff --git a/src/gallium/drivers/iris/iris_batch.c b/src/gallium/drivers/iris/iris_batch.c index 0b7903685f1..e5e23c84693 100644 --- a/src/gallium/drivers/iris/iris_batch.c +++ b/src/gallium/drivers/iris/iris_batch.c @@ -47,7 +47,6 @@ #include "xe/iris_batch.h" #include "common/intel_aux_map.h" -#include "common/intel_defines.h" #include "intel/common/intel_gem.h" #include "intel/compiler/brw_compiler.h" #include "intel/ds/intel_tracepoints.h" diff --git a/src/intel/common/intel_defines.h b/src/intel/common/i915/intel_defines.h similarity index 100% rename from src/intel/common/intel_defines.h rename to src/intel/common/i915/intel_defines.h diff --git a/src/intel/vulkan/i915/anv_device.c b/src/intel/vulkan/i915/anv_device.c index 33eb3a4cdcb..818b514ca1c 100644 --- a/src/intel/vulkan/i915/anv_device.c +++ b/src/intel/vulkan/i915/anv_device.c @@ -23,7 +23,7 @@ #include "i915/anv_device.h" #include "anv_private.h" -#include "common/intel_defines.h" +#include "common/i915/intel_defines.h" #include "common/i915/intel_gem.h" #include "drm-uapi/i915_drm.h" diff --git a/src/intel/vulkan_hasvk/anv_device.c b/src/intel/vulkan_hasvk/anv_device.c index 78f6d4481a7..222730028f8 100644 --- a/src/intel/vulkan_hasvk/anv_device.c +++ b/src/intel/vulkan_hasvk/anv_device.c @@ -54,7 +54,7 @@ #include "vk_util.h" #include "vk_deferred_operation.h" #include "vk_drm_syncobj.h" -#include "common/intel_defines.h" +#include "common/i915/intel_defines.h" #include "common/intel_uuid.h" #include "perf/intel_perf.h" diff --git a/src/intel/vulkan_hasvk/anv_gem.c b/src/intel/vulkan_hasvk/anv_gem.c index 3d9d51e6563..63dfcfde61b 100644 --- a/src/intel/vulkan_hasvk/anv_gem.c +++ b/src/intel/vulkan_hasvk/anv_gem.c @@ -30,7 +30,7 @@ #include #include "anv_private.h" -#include "common/intel_defines.h" +#include "common/i915/intel_defines.h" #include "common/intel_gem.h" /**