Commit 82b1e8f7 authored by Jani Nikula's avatar Jani Nikula

drm/i915/gt: remove a static inline that requires including i915_drv.h

It's actively harmful to add static inlines in headers that require you
to pull in more headers. Remove the include added in commit f1530f91
("drm/i915/gt: Apply workaround 22016122933 correctly"). We see that
there's already an implicit dependency on the i915_drv.h that we need to
address too.

Cc: Andi Shyti <andi.shyti@linux.intel.com>
Cc: Fei Yang <fei.yang@intel.com>
Cc: Jonathan Cavitt <jonathan.cavitt@intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230921162456.3889375-1-jani.nikula@intel.com
parent 0f3fa942
...@@ -1019,3 +1019,8 @@ enum i915_map_type intel_gt_coherent_map_type(struct intel_gt *gt, ...@@ -1019,3 +1019,8 @@ enum i915_map_type intel_gt_coherent_map_type(struct intel_gt *gt,
else else
return I915_MAP_WC; return I915_MAP_WC;
} }
bool intel_gt_needs_wa_22016122933(struct intel_gt *gt)
{
return MEDIA_VER_FULL(gt->i915) == IP_VER(13, 0) && gt->type == GT_MEDIA;
}
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
#ifndef __INTEL_GT__ #ifndef __INTEL_GT__
#define __INTEL_GT__ #define __INTEL_GT__
#include "i915_drv.h"
#include "intel_engine_types.h" #include "intel_engine_types.h"
#include "intel_gt_types.h" #include "intel_gt_types.h"
#include "intel_reset.h" #include "intel_reset.h"
...@@ -88,10 +87,7 @@ static inline bool gt_is_root(struct intel_gt *gt) ...@@ -88,10 +87,7 @@ static inline bool gt_is_root(struct intel_gt *gt)
return !gt->info.id; return !gt->info.id;
} }
static inline bool intel_gt_needs_wa_22016122933(struct intel_gt *gt) bool intel_gt_needs_wa_22016122933(struct intel_gt *gt);
{
return MEDIA_VER_FULL(gt->i915) == IP_VER(13, 0) && gt->type == GT_MEDIA;
}
static inline struct intel_gt *uc_to_gt(struct intel_uc *uc) static inline struct intel_gt *uc_to_gt(struct intel_uc *uc)
{ {
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* Copyright © 2022 Intel Corporation * Copyright © 2022 Intel Corporation
*/ */
#include "i915_drv.h"
#include "intel_gt.h" #include "intel_gt.h"
#include "intel_gt_mcr.h" #include "intel_gt_mcr.h"
#include "intel_gt_print.h" #include "intel_gt_print.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment