From fa0f07c5e1302d68f483c0a9094d5962e6fcadf0 Mon Sep 17 00:00:00 2001
From: Jonathan Gray <jsg@jsg.id.au>
Date: Tue, 19 Dec 2023 18:27:16 +1100
Subject: [PATCH] intel/common: add directory prefix to intel_gem.h include
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Otherwise common/intel_gem.h may get included instead of
common/i915/intel_gem.h when building in a different directory.

Fixes: e050a00b9f4 ("intel/common: Move i915 files to i915 folder")
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26784>
(cherry picked from commit fbb9ce014080edd085b2e998c3e6d7fb569ef0b0)
---
 .pick_status.json                    | 2 +-
 src/intel/common/i915/intel_engine.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 7b16caa..8a54d9b 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -294,7 +294,7 @@
         "description": "intel/common: add directory prefix to intel_gem.h include",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "e050a00b9f4d057e93f61f79019b5cf8bcd04e49",
         "notes": null
diff --git a/src/intel/common/i915/intel_engine.c b/src/intel/common/i915/intel_engine.c
index cc5d9bc..6d99df5 100644
--- a/src/intel/common/i915/intel_engine.c
+++ b/src/intel/common/i915/intel_engine.c
@@ -25,7 +25,7 @@
 
 #include <stdlib.h>
 
-#include "intel_gem.h"
+#include "i915/intel_gem.h"
 
 static enum intel_engine_class
 i915_engine_class_to_intel(enum drm_i915_gem_engine_class i915)
-- 
2.7.4