[Intel-xe] [PATCH v2 9/9] Add new fence_id and fence count functions

[Maarten Lankhorst]

Hey,

Instead of fence_count, wouldn't support_legacy_fencing make more sense?

I think on i915 you would probably want to disable it on new platforms anyway.

~Maarten

On 2023-05-30 12:47, Jouni Högander wrote:
> Add new fence id and fence count functions and use them instead of directly
> accessing struct members
>
> Signed-off-by: Jouni Högander <jouni.hogander at intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_fbc.c         | 16 +++++-----------
>  drivers/gpu/drm/i915/i915_vma.h                  |  5 +++++
>  .../gpu/drm/xe/compat-i915-headers/i915_vma.h    |  2 ++
>  3 files changed, 12 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
> index 2cb537504c2f..7e4dcd747c02 100644
> --- a/drivers/gpu/drm/i915/display/intel_fbc.c
> +++ b/drivers/gpu/drm/i915/display/intel_fbc.c
> @@ -47,6 +47,7 @@
>  #include "i915_reg.h"
>  #include "i915_utils.h"
>  #include "i915_vgpu.h"
> +#include "i915_vma.h"
>  #include "intel_cdclk.h"
>  #include "intel_de.h"
>  #include "intel_display_trace.h"
> @@ -988,17 +989,14 @@ static void intel_fbc_update_state(struct intel_atomic_state *state,
>  
>  	/* FBC1 compression interval: arbitrary choice of 1 second */
>  	fbc_state->interval = drm_mode_vrefresh(&crtc_state->hw.adjusted_mode);
> -#ifdef I915
>  	fbc_state->fence_y_offset = intel_plane_fence_y_offset(plane_state);
>  
>  	drm_WARN_ON(&i915->drm, plane_state->flags & PLANE_HAS_FENCE &&
> -		    !plane_state->ggtt_vma->fence);
> +		    !intel_gt_fence_count(to_gt(i915)));
>  
> -	if (plane_state->flags & PLANE_HAS_FENCE &&
> -	    plane_state->ggtt_vma->fence)
> -		fbc_state->fence_id = plane_state->ggtt_vma->fence->id;
> +	if (plane_state->flags & PLANE_HAS_FENCE)
> +		fbc_state->fence_id =  i915_vma_fence_id(plane_state->ggtt_vma);
>  	else
> -#endif
>  		fbc_state->fence_id = -1;
>  
>  	fbc_state->cfb_stride = intel_fbc_cfb_stride(plane_state);
> @@ -1008,7 +1006,6 @@ static void intel_fbc_update_state(struct intel_atomic_state *state,
>  
>  static bool intel_fbc_is_fence_ok(const struct intel_plane_state *plane_state)
>  {
> -#ifdef I915
>  	struct drm_i915_private *i915 = to_i915(plane_state->uapi.plane->dev);
>  
>  	/*
> @@ -1025,10 +1022,7 @@ static bool intel_fbc_is_fence_ok(const struct intel_plane_state *plane_state)
>  	 */
>  	return DISPLAY_VER(i915) >= 9 ||
>  		(plane_state->flags & PLANE_HAS_FENCE &&
> -		 plane_state->ggtt_vma->fence);
> -#else
> -	return true;
> -#endif
> +		 i915_vma_fence_id(plane_state->ggtt_vma) != -1);
>  }
>  
>  static bool intel_fbc_is_cfb_ok(const struct intel_plane_state *plane_state)
> diff --git a/drivers/gpu/drm/i915/i915_vma.h b/drivers/gpu/drm/i915/i915_vma.h
> index ed5c9d682a1b..06e613752c55 100644
> --- a/drivers/gpu/drm/i915/i915_vma.h
> +++ b/drivers/gpu/drm/i915/i915_vma.h
> @@ -418,6 +418,11 @@ i915_vma_unpin_fence(struct i915_vma *vma)
>  		__i915_vma_unpin_fence(vma);
>  }
>  
> +static inline int i915_vma_fence_id(const struct i915_vma *vma)
> +{
> +	return vma->fence ? vma->fence->id : -1;
> +}
> +
>  void i915_vma_parked(struct intel_gt *gt);
>  
>  static inline bool i915_vma_is_scanout(const struct i915_vma *vma)
> diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_vma.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_vma.h
> index c40bb27ac72a..45ea0e44073d 100644
> --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_vma.h
> +++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_vma.h
> @@ -11,4 +11,6 @@ struct i915_vma {
>  	struct drm_mm_node node;
>  };
>  
> +#define i915_vma_fence_id(vma) -1
> +
>  #endif