[igt-dev] [i-g-t, V4 2/2] i915_drm.h sync

[Matthew Auld]

On Wed, 1 Sept 2021 at 11:41, Tejas Upadhyay
<tejaskumarx.surendrakumar.upadhyay at intel.com> wrote:
>
> Sync to get I915_MMAP_OFFSET_FIXED define value.
>
> Taken from kernel commit:
>     commit 7961c5b60f23 ("drm/i915: Add TTM offset argument to mmap.")

When syncing the uapi header we want to grab all the changes for that
commit, including all the kernel doc etc.

You can run 'make headers_install' on the kernel tree for the above
commit, and then just copy the generated header over to IGT.

>
> Signed-off-by: Tejas Upadhyay <tejaskumarx.surendrakumar.upadhyay at intel.com>
> ---
>  include/drm-uapi/i915_drm.h | 1 +
>  lib/i915/i915_drm_local.h   | 2 --
>  2 files changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/include/drm-uapi/i915_drm.h b/include/drm-uapi/i915_drm.h
> index a1c0030c..b46367f2 100644
> --- a/include/drm-uapi/i915_drm.h
> +++ b/include/drm-uapi/i915_drm.h
> @@ -871,6 +871,7 @@ struct drm_i915_gem_mmap_offset {
>  #define I915_MMAP_OFFSET_WC  1
>  #define I915_MMAP_OFFSET_WB  2
>  #define I915_MMAP_OFFSET_UC  3
> +#define I915_MMAP_OFFSET_FIXED 4
>
>         /*
>          * Zero-terminated chain of extensions.
> diff --git a/lib/i915/i915_drm_local.h b/lib/i915/i915_drm_local.h
> index 0e3cef81..dd646aed 100644
> --- a/lib/i915/i915_drm_local.h
> +++ b/lib/i915/i915_drm_local.h
> @@ -20,8 +20,6 @@ extern "C" {
>   * clean these up when kernel uapi headers are sync'd.
>   */
>
> -#define I915_MMAP_OFFSET_FIXED 4
> -
>  #if defined(__cplusplus)
>  }
>  #endif
> --
> 2.31.1
>