[Intel-xe] [PATCH v3 4/5] drm/xe: Add i915_gem.h compatibility header

[Jani Nikula]

On Wed, 13 Sep 2023, Jouni Högander <jouni.hogander at intel.com> wrote:
> Add i915_gem.h compatibility header and include it in i915_drv.h. Add
> empty GEM_BUG_ON definition for fbc code.

I don't mind merging this as the interim solution so we don't block your
progress, but I think we should just get rid of GEM_BUG_ON/GEM_WARN_ON
in display code:

https://patchwork.freedesktop.org/series/123679/

BR,
Jani.


>
> Signed-off-by: Jouni Högander <jouni.hogander at intel.com>
> ---
>  drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 1 +
>  drivers/gpu/drm/xe/compat-i915-headers/i915_gem.h | 9 +++++++++
>  2 files changed, 10 insertions(+)
>  create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_gem.h
>
> diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
> index 6607c5a374cc..55d0d5c7a386 100644
> --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
> +++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
> @@ -15,6 +15,7 @@
>  #include "xe_bo.h"
>  #include "xe_pm.h"
>  #include "xe_step.h"
> +#include "i915_gem.h"
>  #include "i915_gem_stolen.h"
>  #include "i915_reg_defs.h"
>  #include "i915_utils.h"
> diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_gem.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_gem.h
> new file mode 100644
> index 000000000000..06b723a479c5
> --- /dev/null
> +++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_gem.h
> @@ -0,0 +1,9 @@
> +/* SPDX-License-Identifier: MIT */
> +/*
> + * Copyright © 2023 Intel Corporation
> + */
> +
> +#ifndef __I915_GEM_H__
> +#define __I915_GEM_H__
> +#define GEM_BUG_ON
> +#endif

-- 
Jani Nikula, Intel