From c900a670362be43258a4a2ab8c37d5f0da714487 Mon Sep 17 00:00:00 2001 From: Casey Bowman Date: Thu, 31 Mar 2022 13:43:43 -0700 Subject: [PATCH] drm/i915: Split i915_run_as_guest into x86 and non-x86 Split i915_run_as_guest() into a more arch-friendly function as non-x86 builds do not support this functionality. Signed-off-by: Casey Bowman Acked-by: Tvrtko Ursulin Signed-off-by: Lucas De Marchi Link: https://patchwork.freedesktop.org/patch/msgid/20220331204343.1256150-2-casey.g.bowman@intel.com --- drivers/gpu/drm/i915/i915_utils.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_utils.h b/drivers/gpu/drm/i915/i915_utils.h index b2d89c43f24d..ea7648e3aa0e 100644 --- a/drivers/gpu/drm/i915/i915_utils.h +++ b/drivers/gpu/drm/i915/i915_utils.h @@ -32,7 +32,10 @@ #include #include #include + +#ifdef CONFIG_X86 #include +#endif struct drm_i915_private; struct timer_list; @@ -428,7 +431,12 @@ static inline bool timer_expired(const struct timer_list *t) static inline bool i915_run_as_guest(void) { +#if IS_ENABLED(CONFIG_X86) return !hypervisor_is_type(X86_HYPER_NATIVE); +#else + /* Not supported yet */ + return false; +#endif } bool i915_vtd_active(struct drm_i915_private *i915); -- 2.11.0