diff options
| author |   Rodrigo Vivi <rodrigo.vivi@intel.com> | 2022-04-21 13:44:55 -0400 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2022-04-21 13:48:26 -0400 |
| commit | e1e1f4e32594d117d9f90e7743d33a019139fc9f (patch) | |
| tree | 01bfc642ee798e3e9daedfdaecd168bec4a764b2 /drivers/gpu/drm/i915/i915_gpu_error.h | |
| parent | drm/i915/selftests: tweak the misaligned_case (diff) | |
| parent | Merge tag 'drm-intel-next-2022-04-13-1' of git://anongit.freedesktop.org/drm/drm-intel into drm-next (diff) | |
| download | linux-dev-e1e1f4e32594d117d9f90e7743d33a019139fc9f.tar.xz linux-dev-e1e1f4e32594d117d9f90e7743d33a019139fc9f.zip | |
Merge drm/drm-next into drm-intel-gt-next
In order to get the GSC Support merged on drm-intel-gt-next
in a clean fashion we needed this ATS-M patch to avoid
conflict in i915_pci.c:
commit 412c942bdfae ("drm/i915/ats-m: add ATS-M platform info")
--
Fixing a silent conflict on drivers/gpu/drm/i915/gt/intel_gt_gmch.c:
- if (!intel_vtd_active(i915))
+ if (!i915_vtd_active(i915))
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gpu_error.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gpu_error.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.h b/drivers/gpu/drm/i915/i915_gpu_error.h index 72d86071c0d1..a611abacd9c2 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.h +++ b/drivers/gpu/drm/i915/i915_gpu_error.h @@ -298,6 +298,12 @@ void i915_disable_error_state(struct drm_i915_private *i915, int err); #else +__printf(2, 3) +static inline void +i915_error_printf(struct drm_i915_error_state_buf *e, const char *f, ...) +{ +} + static inline void i915_capture_error_state(struct intel_gt *gt, intel_engine_mask_t engine_mask, u32 dump_flags) { |