[PATCH 1/2] drm/i915: Track fence region ID in plane state

[PATCH 1/2] drm/i915: Track fence region ID in plane state

[Ville Syrjala]

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Get rid of the needlessly complicated PLANE_HAS_FENCE +
intel_parent_vma_fence_id() dance by simply tracking the
fence_id directly in the plane state.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 .../drm/i915/display/intel_display_types.h    |  5 +--
 drivers/gpu/drm/i915/display/intel_fb_pin.c   | 33 ++++++++++---------
 drivers/gpu/drm/i915/display/intel_fb_pin.h   |  5 ++-
 drivers/gpu/drm/i915/display/intel_fbc.c      | 11 ++-----
 drivers/gpu/drm/i915/display/intel_fbdev.c    | 14 ++++----
 drivers/gpu/drm/i915/display/intel_plane.c    |  3 +-
 drivers/gpu/drm/i915/i915_initial_plane.c     |  2 +-
 drivers/gpu/drm/xe/display/xe_fb_pin.c        |  8 ++---
 drivers/gpu/drm/xe/display/xe_initial_plane.c |  2 +-
 9 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index e2496db1642a..73eb4f38620c 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -683,14 +683,15 @@ struct intel_plane_state {
 
 	struct i915_vma *ggtt_vma;
 	struct i915_vma *dpt_vma;
-	unsigned long flags;
-#define PLANE_HAS_FENCE BIT(0)
 
 	struct intel_fb_view view;
 
 	/* for legacy cursor fb unpin */
 	struct drm_vblank_work unpin_work;
 
+	/* fenced region ID (-1 if none) */
+	s8 fence_id;
+
 	/* Plane pxp decryption state */
 	bool decrypt;
 
diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.c b/drivers/gpu/drm/i915/display/intel_fb_pin.c
index 738d77a1468a..0b8b057647af 100644
--- a/drivers/gpu/drm/i915/display/intel_fb_pin.c
+++ b/drivers/gpu/drm/i915/display/intel_fb_pin.c
@@ -26,7 +26,6 @@ static struct i915_vma *
 intel_fb_pin_to_dpt(const struct drm_framebuffer *fb,
 		    const struct i915_gtt_view *view,
 		    unsigned int alignment,
-		    unsigned long *out_flags,
 		    struct intel_dpt *dpt)
 {
 	struct drm_device *dev = fb->dev;
@@ -115,8 +114,7 @@ intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb,
 		     unsigned int alignment,
 		     unsigned int phys_alignment,
 		     unsigned int vtd_guard,
-		     bool uses_fence,
-		     unsigned long *out_flags)
+		     int *out_fence_id)
 {
 	struct drm_device *dev = fb->dev;
 	struct intel_display *display = to_intel_display(dev);
@@ -177,7 +175,10 @@ intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb,
 		goto err_unpin;
 	}
 
-	if (uses_fence && i915_vma_is_map_and_fenceable(vma)) {
+	if (out_fence_id)
+		*out_fence_id = -1;
+
+	if (out_fence_id && i915_vma_is_map_and_fenceable(vma)) {
 		/*
 		 * Install a fence for tiled scan-out. Pre-i965 always needs a
 		 * fence, whereas 965+ only requires a fence if using
@@ -203,7 +204,7 @@ intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb,
 		ret = 0;
 
 		if (vma->fence)
-			*out_flags |= PLANE_HAS_FENCE;
+			*out_fence_id |= vma->fence->id;
 	}
 
 	i915_vma_get(vma);
@@ -225,9 +226,9 @@ intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb,
 	return vma;
 }
 
-void intel_fb_unpin_vma(struct i915_vma *vma, unsigned long flags)
+void intel_fb_unpin_vma(struct i915_vma *vma, int fence_id)
 {
-	if (flags & PLANE_HAS_FENCE)
+	if (fence_id >= 0)
 		i915_vma_unpin_fence(vma);
 	i915_vma_unpin(vma);
 	i915_vma_put(vma);
@@ -271,17 +272,18 @@ int intel_plane_pin_fb(struct intel_plane_state *plane_state,
 	struct i915_vma *vma;
 
 	if (!intel_fb_uses_dpt(&fb->base)) {
+		int fence_id = -1;
+
 		vma = intel_fb_pin_to_ggtt(&fb->base, &plane_state->view.gtt,
 					   intel_plane_fb_min_alignment(plane_state),
 					   intel_plane_fb_min_phys_alignment(plane_state),
 					   intel_plane_fb_vtd_guard(plane_state),
-					   intel_plane_uses_fence(plane_state),
-					   &plane_state->flags);
+					   intel_plane_uses_fence(plane_state) ? &fence_id : NULL);
 		if (IS_ERR(vma))
 			return PTR_ERR(vma);
 
 		plane_state->ggtt_vma = vma;
-
+		plane_state->fence_id = fence_id;
 	} else {
 		unsigned int alignment = intel_plane_fb_min_alignment(plane_state);
 
@@ -292,8 +294,7 @@ int intel_plane_pin_fb(struct intel_plane_state *plane_state,
 		plane_state->ggtt_vma = vma;
 
 		vma = intel_fb_pin_to_dpt(&fb->base, &plane_state->view.gtt,
-					  alignment, &plane_state->flags,
-					  fb->dpt);
+					  alignment, fb->dpt);
 		if (IS_ERR(vma)) {
 			i915_dpt_unpin_from_ggtt(fb->dpt);
 			plane_state->ggtt_vma = NULL;
@@ -338,12 +339,14 @@ void intel_plane_unpin_fb(struct intel_plane_state *old_plane_state)
 
 	if (!intel_fb_uses_dpt(&fb->base)) {
 		vma = fetch_and_zero(&old_plane_state->ggtt_vma);
-		if (vma)
-			intel_fb_unpin_vma(vma, old_plane_state->flags);
+		if (vma) {
+			intel_fb_unpin_vma(vma, old_plane_state->fence_id);
+			old_plane_state->fence_id = -1;
+		}
 	} else {
 		vma = fetch_and_zero(&old_plane_state->dpt_vma);
 		if (vma)
-			intel_fb_unpin_vma(vma, old_plane_state->flags);
+			intel_fb_unpin_vma(vma, -1);
 
 		vma = fetch_and_zero(&old_plane_state->ggtt_vma);
 		if (vma)
diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.h b/drivers/gpu/drm/i915/display/intel_fb_pin.h
index 81ab79da1af7..2eca42b74c4a 100644
--- a/drivers/gpu/drm/i915/display/intel_fb_pin.h
+++ b/drivers/gpu/drm/i915/display/intel_fb_pin.h
@@ -20,10 +20,9 @@ intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb,
 		     unsigned int alignment,
 		     unsigned int phys_alignment,
 		     unsigned int vtd_guard,
-		     bool uses_fence,
-		     unsigned long *out_flags);
+		     int *out_fence_id);
 
-void intel_fb_unpin_vma(struct i915_vma *vma, unsigned long flags);
+void intel_fb_unpin_vma(struct i915_vma *vma, int fence_id);
 
 int intel_plane_pin_fb(struct intel_plane_state *new_plane_state,
 		       const struct intel_plane_state *old_plane_state);
diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
index ea0ce00c8474..677ac5be749b 100644
--- a/drivers/gpu/drm/i915/display/intel_fbc.c
+++ b/drivers/gpu/drm/i915/display/intel_fbc.c
@@ -1458,13 +1458,10 @@ static void intel_fbc_update_state(struct intel_atomic_state *state,
 
 	fbc_state->fence_y_offset = intel_plane_fence_y_offset(plane_state);
 
-	drm_WARN_ON(display->drm, plane_state->flags & PLANE_HAS_FENCE &&
+	drm_WARN_ON(display->drm, plane_state->fence_id >= 0 &&
 		    !intel_fbc_has_fences(display));
 
-	if (plane_state->flags & PLANE_HAS_FENCE)
-		fbc_state->fence_id = intel_parent_vma_fence_id(display, plane_state->ggtt_vma);
-	else
-		fbc_state->fence_id = -1;
+	fbc_state->fence_id = plane_state->fence_id;
 
 	fbc_state->cfb_stride = intel_fbc_cfb_stride(plane_state);
 	fbc_state->cfb_size = intel_fbc_cfb_size(plane_state);
@@ -1487,9 +1484,7 @@ static bool intel_fbc_is_fence_ok(const struct intel_plane_state *plane_state)
 	 * so have no fence associated with it) due to aperture constraints
 	 * at the time of pinning.
 	 */
-	return DISPLAY_VER(display) >= 9 ||
-		(plane_state->flags & PLANE_HAS_FENCE &&
-		 intel_parent_vma_fence_id(display, plane_state->ggtt_vma) != -1);
+	return DISPLAY_VER(display) >= 9 || plane_state->fence_id >= 0;
 }
 
 static bool intel_fbc_is_cfb_ok(const struct intel_plane_state *plane_state)
diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c
index bdaaf3edba0c..0d7be5186393 100644
--- a/drivers/gpu/drm/i915/display/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/display/intel_fbdev.c
@@ -60,7 +60,7 @@
 struct intel_fbdev {
 	struct intel_framebuffer *fb;
 	struct i915_vma *vma;
-	unsigned long vma_flags;
+	s8 fence_id;
 };
 
 static struct intel_fbdev *to_intel_fbdev(struct drm_fb_helper *fb_helper)
@@ -141,7 +141,7 @@ static void intel_fbdev_fb_destroy(struct fb_info *info)
 	 * the info->screen_base mmaping. Leaking the VMA is simpler than
 	 * trying to rectify all the possible error paths leading here.
 	 */
-	intel_fb_unpin_vma(ifbdev->vma, ifbdev->vma_flags);
+	intel_fb_unpin_vma(ifbdev->vma, ifbdev->fence_id);
 	drm_framebuffer_remove(fb_helper->fb);
 
 	drm_client_release(&fb_helper->client);
@@ -269,9 +269,9 @@ int intel_fbdev_driver_fbdev_probe(struct drm_fb_helper *helper,
 	struct fb_info *info = helper->info;
 	struct ref_tracker *wakeref;
 	struct i915_vma *vma;
-	unsigned long flags = 0;
 	bool prealloc = false;
 	struct drm_gem_object *obj;
+	int fence_id = -1;
 	int ret;
 
 	ifbdev->fb = NULL;
@@ -314,7 +314,7 @@ int intel_fbdev_driver_fbdev_probe(struct drm_fb_helper *helper,
 				   fb->min_alignment, 0,
 				   intel_fb_view_vtd_guard(&fb->base, &fb->normal_view,
 							   DRM_MODE_ROTATE_0),
-				   false, &flags);
+				   &fence_id);
 	if (IS_ERR(vma)) {
 		ret = PTR_ERR(vma);
 		goto out_unlock;
@@ -345,14 +345,14 @@ int intel_fbdev_driver_fbdev_probe(struct drm_fb_helper *helper,
 	drm_dbg_kms(display->drm, "allocated %dx%d fb\n", fb->base.width, fb->base.height);
 	ifbdev->fb = fb;
 	ifbdev->vma = vma;
-	ifbdev->vma_flags = flags;
+	ifbdev->fence_id = fence_id;
 
 	intel_display_rpm_put(display, wakeref);
 
 	return 0;
 
 out_unpin:
-	intel_fb_unpin_vma(vma, flags);
+	intel_fb_unpin_vma(vma, fence_id);
 out_unlock:
 	intel_display_rpm_put(display, wakeref);
 
@@ -539,6 +539,8 @@ void intel_fbdev_setup(struct intel_display *display)
 	if (!ifbdev)
 		return;
 
+	ifbdev->fence_id = -1;
+
 	display->fbdev.fbdev = ifbdev;
 	if (intel_fbdev_init_bios(display, ifbdev))
 		preferred_bpp = intel_fbdev_color_mode(ifbdev->fb->base.format);
diff --git a/drivers/gpu/drm/i915/display/intel_plane.c b/drivers/gpu/drm/i915/display/intel_plane.c
index 5390ceb21ca4..f15dd9e91243 100644
--- a/drivers/gpu/drm/i915/display/intel_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_plane.c
@@ -70,6 +70,7 @@ static void intel_plane_state_reset(struct intel_plane_state *plane_state,
 	__drm_atomic_helper_plane_state_reset(&plane_state->uapi, &plane->base);
 
 	plane_state->scaler_id = -1;
+	plane_state->fence_id = -1;
 }
 
 struct intel_plane *intel_plane_alloc(void)
@@ -137,7 +138,7 @@ intel_plane_duplicate_state(struct drm_plane *plane)
 
 	intel_state->ggtt_vma = NULL;
 	intel_state->dpt_vma = NULL;
-	intel_state->flags = 0;
+	intel_state->fence_id = -1;
 	intel_state->damage = DRM_RECT_INIT(0, 0, 0, 0);
 
 	/* add reference to fb */
diff --git a/drivers/gpu/drm/i915/i915_initial_plane.c b/drivers/gpu/drm/i915/i915_initial_plane.c
index 390a9248d631..db51a468ddd4 100644
--- a/drivers/gpu/drm/i915/i915_initial_plane.c
+++ b/drivers/gpu/drm/i915/i915_initial_plane.c
@@ -268,7 +268,7 @@ i915_initial_plane_setup(struct drm_plane_state *_plane_state,
 	plane_state->ggtt_vma = i915_vma_get(vma);
 	if (intel_plane_uses_fence(plane_state) &&
 	    i915_vma_pin_fence(vma) == 0 && vma->fence)
-		plane_state->flags |= PLANE_HAS_FENCE;
+		plane_state->fence_id = vma->fence->id;
 
 	plane_state->surf = i915_ggtt_offset(plane_state->ggtt_vma);
 
diff --git a/drivers/gpu/drm/xe/display/xe_fb_pin.c b/drivers/gpu/drm/xe/display/xe_fb_pin.c
index e45a1e7a4670..739d9c019094 100644
--- a/drivers/gpu/drm/xe/display/xe_fb_pin.c
+++ b/drivers/gpu/drm/xe/display/xe_fb_pin.c
@@ -418,15 +418,15 @@ intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb,
 		     unsigned int alignment,
 		     unsigned int phys_alignment,
 		     unsigned int vtd_guard,
-		     bool uses_fence,
-		     unsigned long *out_flags)
+		     int *out_fence_id)
 {
-	*out_flags = 0;
+	if (out_fence_id)
+		*out_fence_id = -1;
 
 	return __xe_pin_fb_vma(to_intel_framebuffer(fb), view, alignment);
 }
 
-void intel_fb_unpin_vma(struct i915_vma *vma, unsigned long flags)
+void intel_fb_unpin_vma(struct i915_vma *vma, int fence_id)
 {
 	__xe_unpin_fb_vma(vma);
 }
diff --git a/drivers/gpu/drm/xe/display/xe_initial_plane.c b/drivers/gpu/drm/xe/display/xe_initial_plane.c
index 8bcae552dddc..09ec8f94bf57 100644
--- a/drivers/gpu/drm/xe/display/xe_initial_plane.c
+++ b/drivers/gpu/drm/xe/display/xe_initial_plane.c
@@ -153,7 +153,7 @@ xe_initial_plane_setup(struct drm_plane_state *_plane_state,
 	struct i915_vma *vma;
 
 	vma = intel_fb_pin_to_ggtt(fb, &plane_state->view.gtt,
-				   0, 0, 0, false, &plane_state->flags);
+				   0, 0, 0, NULL);
 	if (IS_ERR(vma))
 		return PTR_ERR(vma);
 
-- 
2.52.0

[PATCH 2/2] drm/i915: Remove the vma parent interface

[Ville Syrjala]

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

With the fb pinning stuff directly returning the fence_id
there is no longer any need for the vma parent interface.
Get rid of it.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_parent.c  |  9 ---------
 drivers/gpu/drm/i915/display/intel_parent.h  |  3 ---
 drivers/gpu/drm/i915/i915_driver.c           |  1 -
 drivers/gpu/drm/i915/i915_vma.c              | 10 ----------
 drivers/gpu/drm/i915/i915_vma.h              |  2 --
 include/drm/intel/display_parent_interface.h |  7 -------
 6 files changed, 32 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_parent.c b/drivers/gpu/drm/i915/display/intel_parent.c
index 2e3bad2b3e6b..4142fe3eed7c 100644
--- a/drivers/gpu/drm/i915/display/intel_parent.c
+++ b/drivers/gpu/drm/i915/display/intel_parent.c
@@ -338,15 +338,6 @@ void intel_parent_stolen_node_free(struct intel_display *display, const struct i
 	display->parent->stolen->node_free(node);
 }
 
-/* vma */
-int intel_parent_vma_fence_id(struct intel_display *display, const struct i915_vma *vma)
-{
-	if (!display->parent->vma)
-		return -1;
-
-	return display->parent->vma->fence_id(vma);
-}
-
 /* generic */
 void intel_parent_fence_priority_display(struct intel_display *display, struct dma_fence *fence)
 {
diff --git a/drivers/gpu/drm/i915/display/intel_parent.h b/drivers/gpu/drm/i915/display/intel_parent.h
index 2013e5ed5aa9..c1214d3329a8 100644
--- a/drivers/gpu/drm/i915/display/intel_parent.h
+++ b/drivers/gpu/drm/i915/display/intel_parent.h
@@ -109,9 +109,6 @@ u64 intel_parent_stolen_node_size(struct intel_display *display, const struct in
 struct intel_stolen_node *intel_parent_stolen_node_alloc(struct intel_display *display);
 void intel_parent_stolen_node_free(struct intel_display *display, const struct intel_stolen_node *node);
 
-/* vma */
-int intel_parent_vma_fence_id(struct intel_display *display, const struct i915_vma *vma);
-
 /* generic */
 bool intel_parent_has_auxccs(struct intel_display *display);
 bool intel_parent_has_fenced_regions(struct intel_display *display);
diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index 385a634c3ed0..6dde714d4646 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -780,7 +780,6 @@ static const struct intel_display_parent_interface parent = {
 	.rpm = &i915_display_rpm_interface,
 	.rps = &i915_display_rps_interface,
 	.stolen = &i915_display_stolen_interface,
-	.vma = &i915_display_vma_interface,
 
 	.fence_priority_display = fence_priority_display,
 	.has_auxccs = has_auxccs,
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
index 6a3a4d4244dc..afc192d9931b 100644
--- a/drivers/gpu/drm/i915/i915_vma.c
+++ b/drivers/gpu/drm/i915/i915_vma.c
@@ -27,7 +27,6 @@
 
 #include <drm/drm_gem.h>
 #include <drm/drm_print.h>
-#include <drm/intel/display_parent_interface.h>
 
 #include "display/intel_fb.h"
 #include "display/intel_frontbuffer.h"
@@ -2333,12 +2332,3 @@ int __init i915_vma_module_init(void)
 
 	return 0;
 }
-
-static int i915_vma_fence_id(const struct i915_vma *vma)
-{
-	return vma->fence ? vma->fence->id : -1;
-}
-
-const struct intel_display_vma_interface i915_display_vma_interface = {
-	.fence_id = i915_vma_fence_id,
-};
diff --git a/drivers/gpu/drm/i915/i915_vma.h b/drivers/gpu/drm/i915/i915_vma.h
index fa2d9b429db6..892306ab935d 100644
--- a/drivers/gpu/drm/i915/i915_vma.h
+++ b/drivers/gpu/drm/i915/i915_vma.h
@@ -476,6 +476,4 @@ int i915_vma_module_init(void);
 I915_SELFTEST_DECLARE(int i915_vma_get_pages(struct i915_vma *vma));
 I915_SELFTEST_DECLARE(void i915_vma_put_pages(struct i915_vma *vma));
 
-extern const struct intel_display_vma_interface i915_display_vma_interface;
-
 #endif
diff --git a/include/drm/intel/display_parent_interface.h b/include/drm/intel/display_parent_interface.h
index 97ec94a2e749..aef6a16efd90 100644
--- a/include/drm/intel/display_parent_interface.h
+++ b/include/drm/intel/display_parent_interface.h
@@ -176,10 +176,6 @@ struct intel_display_stolen_interface {
 	void (*node_free)(const struct intel_stolen_node *node);
 };
 
-struct intel_display_vma_interface {
-	int (*fence_id)(const struct i915_vma *vma);
-};
-
 /**
  * struct intel_display_parent_interface - services parent driver provides to display
  *
@@ -235,9 +231,6 @@ struct intel_display_parent_interface {
 	/** @stolen: Stolen memory. */
 	const struct intel_display_stolen_interface *stolen;
 
-	/** @vma: VMA interface. Optional. */
-	const struct intel_display_vma_interface *vma;
-
 	/* Generic independent functions */
 	struct {
 		/** @fence_priority_display: Set display priority. Optional. */
-- 
2.52.0

✗ i915.CI.BAT: failure for series starting with [1/2] drm/i915: Track fence region ID in plane state

[Patchwork]

[-- Attachment #1: Type: text/plain, Size: 15605 bytes --]

== Series Details ==

Series: series starting with [1/2] drm/i915: Track fence region ID in plane state
URL   : https://patchwork.freedesktop.org/series/164182/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_18256 -> Patchwork_164182v1
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with Patchwork_164182v1 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_164182v1, please notify your bug team (I915-ci-infra@lists.freedesktop.org) to allow them
  to document this new failure mode, which will reduce false positives in CI.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_164182v1/index.html

Participating hosts (41 -> 40)
------------------------------

  Additional (1): bat-adls-6 
  Missing    (2): bat-dg2-13 fi-snb-2520m 

Possible new issues
-------------------

  Here are the unknown changes that may have been introduced in Patchwork_164182v1:

### IGT changes ###

#### Possible regressions ####

  * igt@kms_busy@basic:
    - fi-pnv-d510:        [PASS][1] -> [ABORT][2]
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18256/fi-pnv-d510/igt@kms_busy@basic.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_164182v1/fi-pnv-d510/igt@kms_busy@basic.html

  * igt@kms_busy@basic@flip:
    - fi-cfl-8700k:       [PASS][3] -> [DMESG-WARN][4]
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18256/fi-cfl-8700k/igt@kms_busy@basic@flip.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_164182v1/fi-cfl-8700k/igt@kms_busy@basic@flip.html
    - bat-adls-6:         NOTRUN -> [DMESG-WARN][5]
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_164182v1/bat-adls-6/igt@kms_busy@basic@flip.html
    - fi-pnv-d510:        [PASS][6] -> [DMESG-WARN][7]
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18256/fi-pnv-d510/igt@kms_busy@basic@flip.html
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_164182v1/fi-pnv-d510/igt@kms_busy@basic@flip.html
    - bat-rpls-4:         [PASS][8] -> [DMESG-WARN][9]
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18256/bat-rpls-4/igt@kms_busy@basic@flip.html
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_164182v1/bat-rpls-4/igt@kms_busy@basic@flip.html
    - fi-kbl-7567u:       [PASS][10] -> [ABORT][11] +1 other test abort
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18256/fi-kbl-7567u/igt@kms_busy@basic@flip.html
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_164182v1/fi-kbl-7567u/igt@kms_busy@basic@flip.html
    - bat-jsl-5:          [PASS][12] -> [ABORT][13] +1 other test abort
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18256/bat-jsl-5/igt@kms_busy@basic@flip.html
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_164182v1/bat-jsl-5/igt@kms_busy@basic@flip.html
    - fi-tgl-1115g4:      [PASS][14] -> [DMESG-WARN][15]
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18256/fi-tgl-1115g4/igt@kms_busy@basic@flip.html
   [15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_164182v1/fi-tgl-1115g4/igt@kms_busy@basic@flip.html
    - fi-cfl-guc:         [PASS][16] -> [DMESG-WARN][17]
   [16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18256/fi-cfl-guc/igt@kms_busy@basic@flip.html
   [17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_164182v1/fi-cfl-guc/igt@kms_busy@basic@flip.html
    - fi-cfl-8109u:       [PASS][18] -> [ABORT][19] +1 other test abort
   [18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18256/fi-cfl-8109u/igt@kms_busy@basic@flip.html
   [19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_164182v1/fi-cfl-8109u/igt@kms_busy@basic@flip.html

  * igt@kms_busy@basic@modeset:
    - fi-cfl-8700k:       [PASS][20] -> [ABORT][21] +1 other test abort
   [20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18256/fi-cfl-8700k/igt@kms_busy@basic@modeset.html
   [21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_164182v1/fi-cfl-8700k/igt@kms_busy@basic@modeset.html
    - bat-adls-6:         NOTRUN -> [ABORT][22] +1 other test abort
   [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_164182v1/bat-adls-6/igt@kms_busy@basic@modeset.html
    - fi-glk-j4005:       [PASS][23] -> [ABORT][24] +1 other test abort
   [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18256/fi-glk-j4005/igt@kms_busy@basic@modeset.html
   [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_164182v1/fi-glk-j4005/igt@kms_busy@basic@modeset.html
    - bat-rpls-4:         [PASS][25] -> [ABORT][26] +1 other test abort
   [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18256/bat-rpls-4/igt@kms_busy@basic@modeset.html
   [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_164182v1/bat-rpls-4/igt@kms_busy@basic@modeset.html
    - fi-tgl-1115g4:      [PASS][27] -> [ABORT][28] +1 other test abort
   [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18256/fi-tgl-1115g4/igt@kms_busy@basic@modeset.html
   [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_164182v1/fi-tgl-1115g4/igt@kms_busy@basic@modeset.html
    - fi-cfl-guc:         [PASS][29] -> [ABORT][30] +1 other test abort
   [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18256/fi-cfl-guc/igt@kms_busy@basic@modeset.html
   [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_164182v1/fi-cfl-guc/igt@kms_busy@basic@modeset.html

  
#### Warnings ####

  * igt@kms_busy@basic@modeset:
    - fi-pnv-d510:        [SKIP][31] -> [ABORT][32]
   [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18256/fi-pnv-d510/igt@kms_busy@basic@modeset.html
   [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_164182v1/fi-pnv-d510/igt@kms_busy@basic@modeset.html

  
New tests
---------

  New tests have been introduced between CI_DRM_18256 and Patchwork_164182v1:

### New IGT tests (60) ###

  * igt@kms_busy@addfb25-4-tiled:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@addfb25-bad-modifier:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@addfb25-framebuffer-vs-set-tiling:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@addfb25-modifier-no-flag:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@addfb25-x-tiled-legacy:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@addfb25-x-tiled-mismatch-legacy:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@addfb25-y-tiled-legacy:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@addfb25-y-tiled-small-legacy:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@addfb25-yf-tiled-legacy:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@bad-close:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@bad-flink:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@bad-open:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@bad-pitch-0:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@bad-pitch-1024:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@bad-pitch-128:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@bad-pitch-256:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@bad-pitch-32:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@bad-pitch-63:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@bad-pitch-65536:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@bad-pitch-999:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@basic-all:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@basic-await:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@basic-each:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@basic-eu-total:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@basic-process:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@basic-subslice-total:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@basic-x-tiled-legacy:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@basic-y-tiled-legacy:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@bo-too-small:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@bo-too-small-due-to-tiling:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@busy:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@clobberred-modifier:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@create-fd-close:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@double-flink:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@engines:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@error-state-basic:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@flink-lifetime:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@framebuffer-vs-set-tiling:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@info:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@invalid-get-prop:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@invalid-get-prop-any:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@invalid-set-prop:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@invalid-set-prop-any:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@nb-await:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@no-handle:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@nullptr:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@read:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@read-all-entries:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@safe-alignment:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@size-max:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@small-bo:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@tile-pitch-mismatch:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@too-high:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@too-wide:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@unused-handle:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@unused-modifier:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@unused-offsets:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@unused-pitches:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@wait:
    - Statuses :
    - Exec time: [None] s

  * igt@kms_busy@write:
    - Statuses :
    - Exec time: [None] s

  

Known issues
------------

  Here are the changes found in Patchwork_164182v1 that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@dmabuf@all-tests@dma_fence_chain:
    - fi-skl-6600u:       NOTRUN -> [SKIP][33]
   [33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_164182v1/fi-skl-6600u/igt@dmabuf@all-tests@dma_fence_chain.html

  * igt@gem_tiled_pread_basic@basic:
    - bat-adls-6:         NOTRUN -> [SKIP][34] ([i915#15656])
   [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_164182v1/bat-adls-6/igt@gem_tiled_pread_basic@basic.html

  * igt@i915_selftest@live:
    - bat-dg2-8:          [PASS][35] -> [DMESG-FAIL][36] ([i915#12061]) +1 other test dmesg-fail
   [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18256/bat-dg2-8/igt@i915_selftest@live.html
   [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_164182v1/bat-dg2-8/igt@i915_selftest@live.html

  * igt@i915_selftest@live@mman:
    - bat-atsm-1:         [PASS][37] -> [DMESG-FAIL][38] ([i915#14204])
   [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18256/bat-atsm-1/igt@i915_selftest@live@mman.html
   [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_164182v1/bat-atsm-1/igt@i915_selftest@live@mman.html

  * igt@i915_selftest@live@workarounds:
    - bat-arlh-3:         [PASS][39] -> [DMESG-FAIL][40] ([i915#12061]) +1 other test dmesg-fail
   [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18256/bat-arlh-3/igt@i915_selftest@live@workarounds.html
   [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_164182v1/bat-arlh-3/igt@i915_selftest@live@workarounds.html
    - bat-arls-5:         [PASS][41] -> [DMESG-FAIL][42] ([i915#12061]) +1 other test dmesg-fail
   [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18256/bat-arls-5/igt@i915_selftest@live@workarounds.html
   [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_164182v1/bat-arls-5/igt@i915_selftest@live@workarounds.html

  * igt@intel_hwmon@hwmon-read:
    - bat-adls-6:         NOTRUN -> [SKIP][43] ([i915#7707]) +1 other test skip
   [43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_164182v1/bat-adls-6/igt@intel_hwmon@hwmon-read.html

  * igt@kms_busy@basic@modeset:
    - fi-kbl-7567u:       [PASS][44] -> [INCOMPLETE][45] ([i915#10056])
   [44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18256/fi-kbl-7567u/igt@kms_busy@basic@modeset.html
   [45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_164182v1/fi-kbl-7567u/igt@kms_busy@basic@modeset.html
    - bat-jsl-5:          [PASS][46] -> [INCOMPLETE][47] ([i915#10056])
   [46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18256/bat-jsl-5/igt@kms_busy@basic@modeset.html
   [47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_164182v1/bat-jsl-5/igt@kms_busy@basic@modeset.html
    - fi-cfl-8109u:       [PASS][48] -> [INCOMPLETE][49] ([i915#10056])
   [48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18256/fi-cfl-8109u/igt@kms_busy@basic@modeset.html
   [49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_164182v1/fi-cfl-8109u/igt@kms_busy@basic@modeset.html

  
#### Possible fixes ####

  * igt@i915_selftest@live:
    - fi-skl-6600u:       [INCOMPLETE][50] ([i915#15859]) -> [PASS][51]
   [50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18256/fi-skl-6600u/igt@i915_selftest@live.html
   [51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_164182v1/fi-skl-6600u/igt@i915_selftest@live.html

  * igt@i915_selftest@live@gem_contexts:
    - fi-skl-6600u:       [INCOMPLETE][52] -> [PASS][53]
   [52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18256/fi-skl-6600u/igt@i915_selftest@live@gem_contexts.html
   [53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_164182v1/fi-skl-6600u/igt@i915_selftest@live@gem_contexts.html

  
#### Warnings ####

  * igt@i915_selftest@live:
    - bat-atsm-1:         [DMESG-FAIL][54] ([i915#12061]) -> [DMESG-FAIL][55] ([i915#12061] / [i915#14204])
   [54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18256/bat-atsm-1/igt@i915_selftest@live.html
   [55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_164182v1/bat-atsm-1/igt@i915_selftest@live.html

  
  [i915#10056]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10056
  [i915#12061]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12061
  [i915#14204]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/14204
  [i915#15656]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/15656
  [i915#15859]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/15859
  [i915#7707]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/7707


Build changes
-------------

  * Linux: CI_DRM_18256 -> Patchwork_164182v1

  CI-20190529: 20190529
  CI_DRM_18256: 779129c7868f4c7205901d6e57b25de52b411d1c @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_8839: 8839
  Patchwork_164182v1: 779129c7868f4c7205901d6e57b25de52b411d1c @ git://anongit.freedesktop.org/gfx-ci/linux

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_164182v1/index.html

[-- Attachment #2: Type: text/html, Size: 18978 bytes --]

Re: [PATCH 1/2] drm/i915: Track fence region ID in plane state

[Jani Nikula]

On Tue, 31 Mar 2026, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Get rid of the needlessly complicated PLANE_HAS_FENCE +
> intel_parent_vma_fence_id() dance by simply tracking the
> fence_id directly in the plane state.

This is good cleanup, but I still dread what to do about the whole
{intel,xe}_fb_pin.[ch] interface. Needs to be moved to the parent
interface, but there's just too much direct display structure poking
from the i915 and xe cores there. Ugh.

>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
>  .../drm/i915/display/intel_display_types.h    |  5 +--
>  drivers/gpu/drm/i915/display/intel_fb_pin.c   | 33 ++++++++++---------
>  drivers/gpu/drm/i915/display/intel_fb_pin.h   |  5 ++-
>  drivers/gpu/drm/i915/display/intel_fbc.c      | 11 ++-----
>  drivers/gpu/drm/i915/display/intel_fbdev.c    | 14 ++++----
>  drivers/gpu/drm/i915/display/intel_plane.c    |  3 +-
>  drivers/gpu/drm/i915/i915_initial_plane.c     |  2 +-
>  drivers/gpu/drm/xe/display/xe_fb_pin.c        |  8 ++---
>  drivers/gpu/drm/xe/display/xe_initial_plane.c |  2 +-
>  9 files changed, 42 insertions(+), 41 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
> index e2496db1642a..73eb4f38620c 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_types.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
> @@ -683,14 +683,15 @@ struct intel_plane_state {
>  
>  	struct i915_vma *ggtt_vma;
>  	struct i915_vma *dpt_vma;
> -	unsigned long flags;
> -#define PLANE_HAS_FENCE BIT(0)
>  
>  	struct intel_fb_view view;
>  
>  	/* for legacy cursor fb unpin */
>  	struct drm_vblank_work unpin_work;
>  
> +	/* fenced region ID (-1 if none) */
> +	s8 fence_id;

I guess I would've made this an int for consistency with all the
parameters and local variables.

> +
>  	/* Plane pxp decryption state */
>  	bool decrypt;
>  
> diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.c b/drivers/gpu/drm/i915/display/intel_fb_pin.c
> index 738d77a1468a..0b8b057647af 100644
> --- a/drivers/gpu/drm/i915/display/intel_fb_pin.c
> +++ b/drivers/gpu/drm/i915/display/intel_fb_pin.c
> @@ -26,7 +26,6 @@ static struct i915_vma *
>  intel_fb_pin_to_dpt(const struct drm_framebuffer *fb,
>  		    const struct i915_gtt_view *view,
>  		    unsigned int alignment,
> -		    unsigned long *out_flags,
>  		    struct intel_dpt *dpt)
>  {
>  	struct drm_device *dev = fb->dev;
> @@ -115,8 +114,7 @@ intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb,
>  		     unsigned int alignment,
>  		     unsigned int phys_alignment,
>  		     unsigned int vtd_guard,
> -		     bool uses_fence,
> -		     unsigned long *out_flags)
> +		     int *out_fence_id)
>  {
>  	struct drm_device *dev = fb->dev;
>  	struct intel_display *display = to_intel_display(dev);
> @@ -177,7 +175,10 @@ intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb,
>  		goto err_unpin;
>  	}
>  
> -	if (uses_fence && i915_vma_is_map_and_fenceable(vma)) {
> +	if (out_fence_id)
> +		*out_fence_id = -1;
> +
> +	if (out_fence_id && i915_vma_is_map_and_fenceable(vma)) {
>  		/*
>  		 * Install a fence for tiled scan-out. Pre-i965 always needs a
>  		 * fence, whereas 965+ only requires a fence if using
> @@ -203,7 +204,7 @@ intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb,
>  		ret = 0;
>  
>  		if (vma->fence)
> -			*out_flags |= PLANE_HAS_FENCE;
> +			*out_fence_id |= vma->fence->id;
>  	}
>  
>  	i915_vma_get(vma);
> @@ -225,9 +226,9 @@ intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb,
>  	return vma;
>  }
>  
> -void intel_fb_unpin_vma(struct i915_vma *vma, unsigned long flags)
> +void intel_fb_unpin_vma(struct i915_vma *vma, int fence_id)
>  {
> -	if (flags & PLANE_HAS_FENCE)
> +	if (fence_id >= 0)
>  		i915_vma_unpin_fence(vma);
>  	i915_vma_unpin(vma);
>  	i915_vma_put(vma);
> @@ -271,17 +272,18 @@ int intel_plane_pin_fb(struct intel_plane_state *plane_state,
>  	struct i915_vma *vma;
>  
>  	if (!intel_fb_uses_dpt(&fb->base)) {
> +		int fence_id = -1;
> +
>  		vma = intel_fb_pin_to_ggtt(&fb->base, &plane_state->view.gtt,
>  					   intel_plane_fb_min_alignment(plane_state),
>  					   intel_plane_fb_min_phys_alignment(plane_state),
>  					   intel_plane_fb_vtd_guard(plane_state),
> -					   intel_plane_uses_fence(plane_state),
> -					   &plane_state->flags);
> +					   intel_plane_uses_fence(plane_state) ? &fence_id : NULL);

E.g. here you could pass &plane_state->fence_id direcly if it was an int
and ditch the local variable.

>  		if (IS_ERR(vma))
>  			return PTR_ERR(vma);
>  
>  		plane_state->ggtt_vma = vma;
> -
> +		plane_state->fence_id = fence_id;
>  	} else {
>  		unsigned int alignment = intel_plane_fb_min_alignment(plane_state);
>  
> @@ -292,8 +294,7 @@ int intel_plane_pin_fb(struct intel_plane_state *plane_state,
>  		plane_state->ggtt_vma = vma;
>  
>  		vma = intel_fb_pin_to_dpt(&fb->base, &plane_state->view.gtt,
> -					  alignment, &plane_state->flags,
> -					  fb->dpt);
> +					  alignment, fb->dpt);
>  		if (IS_ERR(vma)) {
>  			i915_dpt_unpin_from_ggtt(fb->dpt);
>  			plane_state->ggtt_vma = NULL;
> @@ -338,12 +339,14 @@ void intel_plane_unpin_fb(struct intel_plane_state *old_plane_state)
>  
>  	if (!intel_fb_uses_dpt(&fb->base)) {
>  		vma = fetch_and_zero(&old_plane_state->ggtt_vma);
> -		if (vma)
> -			intel_fb_unpin_vma(vma, old_plane_state->flags);
> +		if (vma) {
> +			intel_fb_unpin_vma(vma, old_plane_state->fence_id);
> +			old_plane_state->fence_id = -1;
> +		}
>  	} else {
>  		vma = fetch_and_zero(&old_plane_state->dpt_vma);
>  		if (vma)
> -			intel_fb_unpin_vma(vma, old_plane_state->flags);
> +			intel_fb_unpin_vma(vma, -1);
>  
>  		vma = fetch_and_zero(&old_plane_state->ggtt_vma);
>  		if (vma)
> diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.h b/drivers/gpu/drm/i915/display/intel_fb_pin.h
> index 81ab79da1af7..2eca42b74c4a 100644
> --- a/drivers/gpu/drm/i915/display/intel_fb_pin.h
> +++ b/drivers/gpu/drm/i915/display/intel_fb_pin.h
> @@ -20,10 +20,9 @@ intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb,
>  		     unsigned int alignment,
>  		     unsigned int phys_alignment,
>  		     unsigned int vtd_guard,
> -		     bool uses_fence,
> -		     unsigned long *out_flags);
> +		     int *out_fence_id);
>  
> -void intel_fb_unpin_vma(struct i915_vma *vma, unsigned long flags);
> +void intel_fb_unpin_vma(struct i915_vma *vma, int fence_id);
>  
>  int intel_plane_pin_fb(struct intel_plane_state *new_plane_state,
>  		       const struct intel_plane_state *old_plane_state);
> diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
> index ea0ce00c8474..677ac5be749b 100644
> --- a/drivers/gpu/drm/i915/display/intel_fbc.c
> +++ b/drivers/gpu/drm/i915/display/intel_fbc.c
> @@ -1458,13 +1458,10 @@ static void intel_fbc_update_state(struct intel_atomic_state *state,
>  
>  	fbc_state->fence_y_offset = intel_plane_fence_y_offset(plane_state);
>  
> -	drm_WARN_ON(display->drm, plane_state->flags & PLANE_HAS_FENCE &&
> +	drm_WARN_ON(display->drm, plane_state->fence_id >= 0 &&
>  		    !intel_fbc_has_fences(display));
>  
> -	if (plane_state->flags & PLANE_HAS_FENCE)
> -		fbc_state->fence_id = intel_parent_vma_fence_id(display, plane_state->ggtt_vma);
> -	else
> -		fbc_state->fence_id = -1;
> +	fbc_state->fence_id = plane_state->fence_id;
>  
>  	fbc_state->cfb_stride = intel_fbc_cfb_stride(plane_state);
>  	fbc_state->cfb_size = intel_fbc_cfb_size(plane_state);
> @@ -1487,9 +1484,7 @@ static bool intel_fbc_is_fence_ok(const struct intel_plane_state *plane_state)
>  	 * so have no fence associated with it) due to aperture constraints
>  	 * at the time of pinning.
>  	 */
> -	return DISPLAY_VER(display) >= 9 ||
> -		(plane_state->flags & PLANE_HAS_FENCE &&
> -		 intel_parent_vma_fence_id(display, plane_state->ggtt_vma) != -1);
> +	return DISPLAY_VER(display) >= 9 || plane_state->fence_id >= 0;
>  }
>  
>  static bool intel_fbc_is_cfb_ok(const struct intel_plane_state *plane_state)
> diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c
> index bdaaf3edba0c..0d7be5186393 100644
> --- a/drivers/gpu/drm/i915/display/intel_fbdev.c
> +++ b/drivers/gpu/drm/i915/display/intel_fbdev.c
> @@ -60,7 +60,7 @@
>  struct intel_fbdev {
>  	struct intel_framebuffer *fb;
>  	struct i915_vma *vma;
> -	unsigned long vma_flags;
> +	s8 fence_id;

Ditto.

Regardless,

Reviewed-by: Jani Nikula <jani.nikula@intel.com>


>  };
>  
>  static struct intel_fbdev *to_intel_fbdev(struct drm_fb_helper *fb_helper)
> @@ -141,7 +141,7 @@ static void intel_fbdev_fb_destroy(struct fb_info *info)
>  	 * the info->screen_base mmaping. Leaking the VMA is simpler than
>  	 * trying to rectify all the possible error paths leading here.
>  	 */
> -	intel_fb_unpin_vma(ifbdev->vma, ifbdev->vma_flags);
> +	intel_fb_unpin_vma(ifbdev->vma, ifbdev->fence_id);
>  	drm_framebuffer_remove(fb_helper->fb);
>  
>  	drm_client_release(&fb_helper->client);
> @@ -269,9 +269,9 @@ int intel_fbdev_driver_fbdev_probe(struct drm_fb_helper *helper,
>  	struct fb_info *info = helper->info;
>  	struct ref_tracker *wakeref;
>  	struct i915_vma *vma;
> -	unsigned long flags = 0;
>  	bool prealloc = false;
>  	struct drm_gem_object *obj;
> +	int fence_id = -1;
>  	int ret;
>  
>  	ifbdev->fb = NULL;
> @@ -314,7 +314,7 @@ int intel_fbdev_driver_fbdev_probe(struct drm_fb_helper *helper,
>  				   fb->min_alignment, 0,
>  				   intel_fb_view_vtd_guard(&fb->base, &fb->normal_view,
>  							   DRM_MODE_ROTATE_0),
> -				   false, &flags);
> +				   &fence_id);
>  	if (IS_ERR(vma)) {
>  		ret = PTR_ERR(vma);
>  		goto out_unlock;
> @@ -345,14 +345,14 @@ int intel_fbdev_driver_fbdev_probe(struct drm_fb_helper *helper,
>  	drm_dbg_kms(display->drm, "allocated %dx%d fb\n", fb->base.width, fb->base.height);
>  	ifbdev->fb = fb;
>  	ifbdev->vma = vma;
> -	ifbdev->vma_flags = flags;
> +	ifbdev->fence_id = fence_id;
>  
>  	intel_display_rpm_put(display, wakeref);
>  
>  	return 0;
>  
>  out_unpin:
> -	intel_fb_unpin_vma(vma, flags);
> +	intel_fb_unpin_vma(vma, fence_id);
>  out_unlock:
>  	intel_display_rpm_put(display, wakeref);
>  
> @@ -539,6 +539,8 @@ void intel_fbdev_setup(struct intel_display *display)
>  	if (!ifbdev)
>  		return;
>  
> +	ifbdev->fence_id = -1;
> +
>  	display->fbdev.fbdev = ifbdev;
>  	if (intel_fbdev_init_bios(display, ifbdev))
>  		preferred_bpp = intel_fbdev_color_mode(ifbdev->fb->base.format);
> diff --git a/drivers/gpu/drm/i915/display/intel_plane.c b/drivers/gpu/drm/i915/display/intel_plane.c
> index 5390ceb21ca4..f15dd9e91243 100644
> --- a/drivers/gpu/drm/i915/display/intel_plane.c
> +++ b/drivers/gpu/drm/i915/display/intel_plane.c
> @@ -70,6 +70,7 @@ static void intel_plane_state_reset(struct intel_plane_state *plane_state,
>  	__drm_atomic_helper_plane_state_reset(&plane_state->uapi, &plane->base);
>  
>  	plane_state->scaler_id = -1;
> +	plane_state->fence_id = -1;
>  }
>  
>  struct intel_plane *intel_plane_alloc(void)
> @@ -137,7 +138,7 @@ intel_plane_duplicate_state(struct drm_plane *plane)
>  
>  	intel_state->ggtt_vma = NULL;
>  	intel_state->dpt_vma = NULL;
> -	intel_state->flags = 0;
> +	intel_state->fence_id = -1;
>  	intel_state->damage = DRM_RECT_INIT(0, 0, 0, 0);
>  
>  	/* add reference to fb */
> diff --git a/drivers/gpu/drm/i915/i915_initial_plane.c b/drivers/gpu/drm/i915/i915_initial_plane.c
> index 390a9248d631..db51a468ddd4 100644
> --- a/drivers/gpu/drm/i915/i915_initial_plane.c
> +++ b/drivers/gpu/drm/i915/i915_initial_plane.c
> @@ -268,7 +268,7 @@ i915_initial_plane_setup(struct drm_plane_state *_plane_state,
>  	plane_state->ggtt_vma = i915_vma_get(vma);
>  	if (intel_plane_uses_fence(plane_state) &&
>  	    i915_vma_pin_fence(vma) == 0 && vma->fence)
> -		plane_state->flags |= PLANE_HAS_FENCE;
> +		plane_state->fence_id = vma->fence->id;
>  
>  	plane_state->surf = i915_ggtt_offset(plane_state->ggtt_vma);
>  
> diff --git a/drivers/gpu/drm/xe/display/xe_fb_pin.c b/drivers/gpu/drm/xe/display/xe_fb_pin.c
> index e45a1e7a4670..739d9c019094 100644
> --- a/drivers/gpu/drm/xe/display/xe_fb_pin.c
> +++ b/drivers/gpu/drm/xe/display/xe_fb_pin.c
> @@ -418,15 +418,15 @@ intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb,
>  		     unsigned int alignment,
>  		     unsigned int phys_alignment,
>  		     unsigned int vtd_guard,
> -		     bool uses_fence,
> -		     unsigned long *out_flags)
> +		     int *out_fence_id)
>  {
> -	*out_flags = 0;
> +	if (out_fence_id)
> +		*out_fence_id = -1;
>  
>  	return __xe_pin_fb_vma(to_intel_framebuffer(fb), view, alignment);
>  }
>  
> -void intel_fb_unpin_vma(struct i915_vma *vma, unsigned long flags)
> +void intel_fb_unpin_vma(struct i915_vma *vma, int fence_id)
>  {
>  	__xe_unpin_fb_vma(vma);
>  }
> diff --git a/drivers/gpu/drm/xe/display/xe_initial_plane.c b/drivers/gpu/drm/xe/display/xe_initial_plane.c
> index 8bcae552dddc..09ec8f94bf57 100644
> --- a/drivers/gpu/drm/xe/display/xe_initial_plane.c
> +++ b/drivers/gpu/drm/xe/display/xe_initial_plane.c
> @@ -153,7 +153,7 @@ xe_initial_plane_setup(struct drm_plane_state *_plane_state,
>  	struct i915_vma *vma;
>  
>  	vma = intel_fb_pin_to_ggtt(fb, &plane_state->view.gtt,
> -				   0, 0, 0, false, &plane_state->flags);
> +				   0, 0, 0, NULL);
>  	if (IS_ERR(vma))
>  		return PTR_ERR(vma);

-- 
Jani Nikula, Intel

Re: [PATCH 2/2] drm/i915: Remove the vma parent interface

[Jani Nikula]

On Tue, 31 Mar 2026, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> With the fb pinning stuff directly returning the fence_id
> there is no longer any need for the vma parent interface.
> Get rid of it.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Reviewed-by: Jani Nikula <jani.nikula@intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_parent.c  |  9 ---------
>  drivers/gpu/drm/i915/display/intel_parent.h  |  3 ---
>  drivers/gpu/drm/i915/i915_driver.c           |  1 -
>  drivers/gpu/drm/i915/i915_vma.c              | 10 ----------
>  drivers/gpu/drm/i915/i915_vma.h              |  2 --
>  include/drm/intel/display_parent_interface.h |  7 -------
>  6 files changed, 32 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_parent.c b/drivers/gpu/drm/i915/display/intel_parent.c
> index 2e3bad2b3e6b..4142fe3eed7c 100644
> --- a/drivers/gpu/drm/i915/display/intel_parent.c
> +++ b/drivers/gpu/drm/i915/display/intel_parent.c
> @@ -338,15 +338,6 @@ void intel_parent_stolen_node_free(struct intel_display *display, const struct i
>  	display->parent->stolen->node_free(node);
>  }
>  
> -/* vma */
> -int intel_parent_vma_fence_id(struct intel_display *display, const struct i915_vma *vma)
> -{
> -	if (!display->parent->vma)
> -		return -1;
> -
> -	return display->parent->vma->fence_id(vma);
> -}
> -
>  /* generic */
>  void intel_parent_fence_priority_display(struct intel_display *display, struct dma_fence *fence)
>  {
> diff --git a/drivers/gpu/drm/i915/display/intel_parent.h b/drivers/gpu/drm/i915/display/intel_parent.h
> index 2013e5ed5aa9..c1214d3329a8 100644
> --- a/drivers/gpu/drm/i915/display/intel_parent.h
> +++ b/drivers/gpu/drm/i915/display/intel_parent.h
> @@ -109,9 +109,6 @@ u64 intel_parent_stolen_node_size(struct intel_display *display, const struct in
>  struct intel_stolen_node *intel_parent_stolen_node_alloc(struct intel_display *display);
>  void intel_parent_stolen_node_free(struct intel_display *display, const struct intel_stolen_node *node);
>  
> -/* vma */
> -int intel_parent_vma_fence_id(struct intel_display *display, const struct i915_vma *vma);
> -
>  /* generic */
>  bool intel_parent_has_auxccs(struct intel_display *display);
>  bool intel_parent_has_fenced_regions(struct intel_display *display);
> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
> index 385a634c3ed0..6dde714d4646 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -780,7 +780,6 @@ static const struct intel_display_parent_interface parent = {
>  	.rpm = &i915_display_rpm_interface,
>  	.rps = &i915_display_rps_interface,
>  	.stolen = &i915_display_stolen_interface,
> -	.vma = &i915_display_vma_interface,
>  
>  	.fence_priority_display = fence_priority_display,
>  	.has_auxccs = has_auxccs,
> diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
> index 6a3a4d4244dc..afc192d9931b 100644
> --- a/drivers/gpu/drm/i915/i915_vma.c
> +++ b/drivers/gpu/drm/i915/i915_vma.c
> @@ -27,7 +27,6 @@
>  
>  #include <drm/drm_gem.h>
>  #include <drm/drm_print.h>
> -#include <drm/intel/display_parent_interface.h>
>  
>  #include "display/intel_fb.h"
>  #include "display/intel_frontbuffer.h"
> @@ -2333,12 +2332,3 @@ int __init i915_vma_module_init(void)
>  
>  	return 0;
>  }
> -
> -static int i915_vma_fence_id(const struct i915_vma *vma)
> -{
> -	return vma->fence ? vma->fence->id : -1;
> -}
> -
> -const struct intel_display_vma_interface i915_display_vma_interface = {
> -	.fence_id = i915_vma_fence_id,
> -};
> diff --git a/drivers/gpu/drm/i915/i915_vma.h b/drivers/gpu/drm/i915/i915_vma.h
> index fa2d9b429db6..892306ab935d 100644
> --- a/drivers/gpu/drm/i915/i915_vma.h
> +++ b/drivers/gpu/drm/i915/i915_vma.h
> @@ -476,6 +476,4 @@ int i915_vma_module_init(void);
>  I915_SELFTEST_DECLARE(int i915_vma_get_pages(struct i915_vma *vma));
>  I915_SELFTEST_DECLARE(void i915_vma_put_pages(struct i915_vma *vma));
>  
> -extern const struct intel_display_vma_interface i915_display_vma_interface;
> -
>  #endif
> diff --git a/include/drm/intel/display_parent_interface.h b/include/drm/intel/display_parent_interface.h
> index 97ec94a2e749..aef6a16efd90 100644
> --- a/include/drm/intel/display_parent_interface.h
> +++ b/include/drm/intel/display_parent_interface.h
> @@ -176,10 +176,6 @@ struct intel_display_stolen_interface {
>  	void (*node_free)(const struct intel_stolen_node *node);
>  };
>  
> -struct intel_display_vma_interface {
> -	int (*fence_id)(const struct i915_vma *vma);
> -};
> -
>  /**
>   * struct intel_display_parent_interface - services parent driver provides to display
>   *
> @@ -235,9 +231,6 @@ struct intel_display_parent_interface {
>  	/** @stolen: Stolen memory. */
>  	const struct intel_display_stolen_interface *stolen;
>  
> -	/** @vma: VMA interface. Optional. */
> -	const struct intel_display_vma_interface *vma;
> -
>  	/* Generic independent functions */
>  	struct {
>  		/** @fence_priority_display: Set display priority. Optional. */

-- 
Jani Nikula, Intel

Re: [PATCH 1/2] drm/i915: Track fence region ID in plane state

[Ville Syrjälä]

On Wed, Apr 01, 2026 at 04:10:16PM +0300, Jani Nikula wrote:
> On Tue, 31 Mar 2026, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >
> > Get rid of the needlessly complicated PLANE_HAS_FENCE +
> > intel_parent_vma_fence_id() dance by simply tracking the
> > fence_id directly in the plane state.
> 
> This is good cleanup, but I still dread what to do about the whole
> {intel,xe}_fb_pin.[ch] interface. Needs to be moved to the parent
> interface, but there's just too much direct display structure poking
> from the i915 and xe cores there. Ugh.

Hmm. I'll put on my thinking cap and ponder about it a bit...

> 
> >
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > ---
> >  .../drm/i915/display/intel_display_types.h    |  5 +--
> >  drivers/gpu/drm/i915/display/intel_fb_pin.c   | 33 ++++++++++---------
> >  drivers/gpu/drm/i915/display/intel_fb_pin.h   |  5 ++-
> >  drivers/gpu/drm/i915/display/intel_fbc.c      | 11 ++-----
> >  drivers/gpu/drm/i915/display/intel_fbdev.c    | 14 ++++----
> >  drivers/gpu/drm/i915/display/intel_plane.c    |  3 +-
> >  drivers/gpu/drm/i915/i915_initial_plane.c     |  2 +-
> >  drivers/gpu/drm/xe/display/xe_fb_pin.c        |  8 ++---
> >  drivers/gpu/drm/xe/display/xe_initial_plane.c |  2 +-
> >  9 files changed, 42 insertions(+), 41 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
> > index e2496db1642a..73eb4f38620c 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display_types.h
> > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
> > @@ -683,14 +683,15 @@ struct intel_plane_state {
> >  
> >  	struct i915_vma *ggtt_vma;
> >  	struct i915_vma *dpt_vma;
> > -	unsigned long flags;
> > -#define PLANE_HAS_FENCE BIT(0)
> >  
> >  	struct intel_fb_view view;
> >  
> >  	/* for legacy cursor fb unpin */
> >  	struct drm_vblank_work unpin_work;
> >  
> > +	/* fenced region ID (-1 if none) */
> > +	s8 fence_id;
> 
> I guess I would've made this an int for consistency with all the
> parameters and local variables.

I considered it after the fact. But FBC had the s8, and I found it
really hard to give up on that nice little hole I found :/

> 
> > +
> >  	/* Plane pxp decryption state */
> >  	bool decrypt;
> >  
> > diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.c b/drivers/gpu/drm/i915/display/intel_fb_pin.c
> > index 738d77a1468a..0b8b057647af 100644
> > --- a/drivers/gpu/drm/i915/display/intel_fb_pin.c
> > +++ b/drivers/gpu/drm/i915/display/intel_fb_pin.c
> > @@ -26,7 +26,6 @@ static struct i915_vma *
> >  intel_fb_pin_to_dpt(const struct drm_framebuffer *fb,
> >  		    const struct i915_gtt_view *view,
> >  		    unsigned int alignment,
> > -		    unsigned long *out_flags,
> >  		    struct intel_dpt *dpt)
> >  {
> >  	struct drm_device *dev = fb->dev;
> > @@ -115,8 +114,7 @@ intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb,
> >  		     unsigned int alignment,
> >  		     unsigned int phys_alignment,
> >  		     unsigned int vtd_guard,
> > -		     bool uses_fence,
> > -		     unsigned long *out_flags)
> > +		     int *out_fence_id)
> >  {
> >  	struct drm_device *dev = fb->dev;
> >  	struct intel_display *display = to_intel_display(dev);
> > @@ -177,7 +175,10 @@ intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb,
> >  		goto err_unpin;
> >  	}
> >  
> > -	if (uses_fence && i915_vma_is_map_and_fenceable(vma)) {
> > +	if (out_fence_id)
> > +		*out_fence_id = -1;
> > +
> > +	if (out_fence_id && i915_vma_is_map_and_fenceable(vma)) {
> >  		/*
> >  		 * Install a fence for tiled scan-out. Pre-i965 always needs a
> >  		 * fence, whereas 965+ only requires a fence if using
> > @@ -203,7 +204,7 @@ intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb,
> >  		ret = 0;
> >  
> >  		if (vma->fence)
> > -			*out_flags |= PLANE_HAS_FENCE;
> > +			*out_fence_id |= vma->fence->id;
> >  	}
> >  
> >  	i915_vma_get(vma);
> > @@ -225,9 +226,9 @@ intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb,
> >  	return vma;
> >  }
> >  
> > -void intel_fb_unpin_vma(struct i915_vma *vma, unsigned long flags)
> > +void intel_fb_unpin_vma(struct i915_vma *vma, int fence_id)
> >  {
> > -	if (flags & PLANE_HAS_FENCE)
> > +	if (fence_id >= 0)
> >  		i915_vma_unpin_fence(vma);
> >  	i915_vma_unpin(vma);
> >  	i915_vma_put(vma);
> > @@ -271,17 +272,18 @@ int intel_plane_pin_fb(struct intel_plane_state *plane_state,
> >  	struct i915_vma *vma;
> >  
> >  	if (!intel_fb_uses_dpt(&fb->base)) {
> > +		int fence_id = -1;
> > +
> >  		vma = intel_fb_pin_to_ggtt(&fb->base, &plane_state->view.gtt,
> >  					   intel_plane_fb_min_alignment(plane_state),
> >  					   intel_plane_fb_min_phys_alignment(plane_state),
> >  					   intel_plane_fb_vtd_guard(plane_state),
> > -					   intel_plane_uses_fence(plane_state),
> > -					   &plane_state->flags);
> > +					   intel_plane_uses_fence(plane_state) ? &fence_id : NULL);
> 
> E.g. here you could pass &plane_state->fence_id direcly if it was an int
> and ditch the local variable.
> 
> >  		if (IS_ERR(vma))
> >  			return PTR_ERR(vma);
> >  
> >  		plane_state->ggtt_vma = vma;
> > -
> > +		plane_state->fence_id = fence_id;
> >  	} else {
> >  		unsigned int alignment = intel_plane_fb_min_alignment(plane_state);
> >  
> > @@ -292,8 +294,7 @@ int intel_plane_pin_fb(struct intel_plane_state *plane_state,
> >  		plane_state->ggtt_vma = vma;
> >  
> >  		vma = intel_fb_pin_to_dpt(&fb->base, &plane_state->view.gtt,
> > -					  alignment, &plane_state->flags,
> > -					  fb->dpt);
> > +					  alignment, fb->dpt);
> >  		if (IS_ERR(vma)) {
> >  			i915_dpt_unpin_from_ggtt(fb->dpt);
> >  			plane_state->ggtt_vma = NULL;
> > @@ -338,12 +339,14 @@ void intel_plane_unpin_fb(struct intel_plane_state *old_plane_state)
> >  
> >  	if (!intel_fb_uses_dpt(&fb->base)) {
> >  		vma = fetch_and_zero(&old_plane_state->ggtt_vma);
> > -		if (vma)
> > -			intel_fb_unpin_vma(vma, old_plane_state->flags);
> > +		if (vma) {
> > +			intel_fb_unpin_vma(vma, old_plane_state->fence_id);
> > +			old_plane_state->fence_id = -1;
> > +		}
> >  	} else {
> >  		vma = fetch_and_zero(&old_plane_state->dpt_vma);
> >  		if (vma)
> > -			intel_fb_unpin_vma(vma, old_plane_state->flags);
> > +			intel_fb_unpin_vma(vma, -1);
> >  
> >  		vma = fetch_and_zero(&old_plane_state->ggtt_vma);
> >  		if (vma)
> > diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.h b/drivers/gpu/drm/i915/display/intel_fb_pin.h
> > index 81ab79da1af7..2eca42b74c4a 100644
> > --- a/drivers/gpu/drm/i915/display/intel_fb_pin.h
> > +++ b/drivers/gpu/drm/i915/display/intel_fb_pin.h
> > @@ -20,10 +20,9 @@ intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb,
> >  		     unsigned int alignment,
> >  		     unsigned int phys_alignment,
> >  		     unsigned int vtd_guard,
> > -		     bool uses_fence,
> > -		     unsigned long *out_flags);
> > +		     int *out_fence_id);
> >  
> > -void intel_fb_unpin_vma(struct i915_vma *vma, unsigned long flags);
> > +void intel_fb_unpin_vma(struct i915_vma *vma, int fence_id);
> >  
> >  int intel_plane_pin_fb(struct intel_plane_state *new_plane_state,
> >  		       const struct intel_plane_state *old_plane_state);
> > diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
> > index ea0ce00c8474..677ac5be749b 100644
> > --- a/drivers/gpu/drm/i915/display/intel_fbc.c
> > +++ b/drivers/gpu/drm/i915/display/intel_fbc.c
> > @@ -1458,13 +1458,10 @@ static void intel_fbc_update_state(struct intel_atomic_state *state,
> >  
> >  	fbc_state->fence_y_offset = intel_plane_fence_y_offset(plane_state);
> >  
> > -	drm_WARN_ON(display->drm, plane_state->flags & PLANE_HAS_FENCE &&
> > +	drm_WARN_ON(display->drm, plane_state->fence_id >= 0 &&
> >  		    !intel_fbc_has_fences(display));
> >  
> > -	if (plane_state->flags & PLANE_HAS_FENCE)
> > -		fbc_state->fence_id = intel_parent_vma_fence_id(display, plane_state->ggtt_vma);
> > -	else
> > -		fbc_state->fence_id = -1;
> > +	fbc_state->fence_id = plane_state->fence_id;
> >  
> >  	fbc_state->cfb_stride = intel_fbc_cfb_stride(plane_state);
> >  	fbc_state->cfb_size = intel_fbc_cfb_size(plane_state);
> > @@ -1487,9 +1484,7 @@ static bool intel_fbc_is_fence_ok(const struct intel_plane_state *plane_state)
> >  	 * so have no fence associated with it) due to aperture constraints
> >  	 * at the time of pinning.
> >  	 */
> > -	return DISPLAY_VER(display) >= 9 ||
> > -		(plane_state->flags & PLANE_HAS_FENCE &&
> > -		 intel_parent_vma_fence_id(display, plane_state->ggtt_vma) != -1);
> > +	return DISPLAY_VER(display) >= 9 || plane_state->fence_id >= 0;
> >  }
> >  
> >  static bool intel_fbc_is_cfb_ok(const struct intel_plane_state *plane_state)
> > diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c
> > index bdaaf3edba0c..0d7be5186393 100644
> > --- a/drivers/gpu/drm/i915/display/intel_fbdev.c
> > +++ b/drivers/gpu/drm/i915/display/intel_fbdev.c
> > @@ -60,7 +60,7 @@
> >  struct intel_fbdev {
> >  	struct intel_framebuffer *fb;
> >  	struct i915_vma *vma;
> > -	unsigned long vma_flags;
> > +	s8 fence_id;
> 
> Ditto.
> 
> Regardless,
> 
> Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> 
> 
> >  };
> >  
> >  static struct intel_fbdev *to_intel_fbdev(struct drm_fb_helper *fb_helper)
> > @@ -141,7 +141,7 @@ static void intel_fbdev_fb_destroy(struct fb_info *info)
> >  	 * the info->screen_base mmaping. Leaking the VMA is simpler than
> >  	 * trying to rectify all the possible error paths leading here.
> >  	 */
> > -	intel_fb_unpin_vma(ifbdev->vma, ifbdev->vma_flags);
> > +	intel_fb_unpin_vma(ifbdev->vma, ifbdev->fence_id);
> >  	drm_framebuffer_remove(fb_helper->fb);
> >  
> >  	drm_client_release(&fb_helper->client);
> > @@ -269,9 +269,9 @@ int intel_fbdev_driver_fbdev_probe(struct drm_fb_helper *helper,
> >  	struct fb_info *info = helper->info;
> >  	struct ref_tracker *wakeref;
> >  	struct i915_vma *vma;
> > -	unsigned long flags = 0;
> >  	bool prealloc = false;
> >  	struct drm_gem_object *obj;
> > +	int fence_id = -1;
> >  	int ret;
> >  
> >  	ifbdev->fb = NULL;
> > @@ -314,7 +314,7 @@ int intel_fbdev_driver_fbdev_probe(struct drm_fb_helper *helper,
> >  				   fb->min_alignment, 0,
> >  				   intel_fb_view_vtd_guard(&fb->base, &fb->normal_view,
> >  							   DRM_MODE_ROTATE_0),
> > -				   false, &flags);
> > +				   &fence_id);
> >  	if (IS_ERR(vma)) {
> >  		ret = PTR_ERR(vma);
> >  		goto out_unlock;
> > @@ -345,14 +345,14 @@ int intel_fbdev_driver_fbdev_probe(struct drm_fb_helper *helper,
> >  	drm_dbg_kms(display->drm, "allocated %dx%d fb\n", fb->base.width, fb->base.height);
> >  	ifbdev->fb = fb;
> >  	ifbdev->vma = vma;
> > -	ifbdev->vma_flags = flags;
> > +	ifbdev->fence_id = fence_id;
> >  
> >  	intel_display_rpm_put(display, wakeref);
> >  
> >  	return 0;
> >  
> >  out_unpin:
> > -	intel_fb_unpin_vma(vma, flags);
> > +	intel_fb_unpin_vma(vma, fence_id);
> >  out_unlock:
> >  	intel_display_rpm_put(display, wakeref);
> >  
> > @@ -539,6 +539,8 @@ void intel_fbdev_setup(struct intel_display *display)
> >  	if (!ifbdev)
> >  		return;
> >  
> > +	ifbdev->fence_id = -1;
> > +
> >  	display->fbdev.fbdev = ifbdev;
> >  	if (intel_fbdev_init_bios(display, ifbdev))
> >  		preferred_bpp = intel_fbdev_color_mode(ifbdev->fb->base.format);
> > diff --git a/drivers/gpu/drm/i915/display/intel_plane.c b/drivers/gpu/drm/i915/display/intel_plane.c
> > index 5390ceb21ca4..f15dd9e91243 100644
> > --- a/drivers/gpu/drm/i915/display/intel_plane.c
> > +++ b/drivers/gpu/drm/i915/display/intel_plane.c
> > @@ -70,6 +70,7 @@ static void intel_plane_state_reset(struct intel_plane_state *plane_state,
> >  	__drm_atomic_helper_plane_state_reset(&plane_state->uapi, &plane->base);
> >  
> >  	plane_state->scaler_id = -1;
> > +	plane_state->fence_id = -1;
> >  }
> >  
> >  struct intel_plane *intel_plane_alloc(void)
> > @@ -137,7 +138,7 @@ intel_plane_duplicate_state(struct drm_plane *plane)
> >  
> >  	intel_state->ggtt_vma = NULL;
> >  	intel_state->dpt_vma = NULL;
> > -	intel_state->flags = 0;
> > +	intel_state->fence_id = -1;
> >  	intel_state->damage = DRM_RECT_INIT(0, 0, 0, 0);
> >  
> >  	/* add reference to fb */
> > diff --git a/drivers/gpu/drm/i915/i915_initial_plane.c b/drivers/gpu/drm/i915/i915_initial_plane.c
> > index 390a9248d631..db51a468ddd4 100644
> > --- a/drivers/gpu/drm/i915/i915_initial_plane.c
> > +++ b/drivers/gpu/drm/i915/i915_initial_plane.c
> > @@ -268,7 +268,7 @@ i915_initial_plane_setup(struct drm_plane_state *_plane_state,
> >  	plane_state->ggtt_vma = i915_vma_get(vma);
> >  	if (intel_plane_uses_fence(plane_state) &&
> >  	    i915_vma_pin_fence(vma) == 0 && vma->fence)
> > -		plane_state->flags |= PLANE_HAS_FENCE;
> > +		plane_state->fence_id = vma->fence->id;
> >  
> >  	plane_state->surf = i915_ggtt_offset(plane_state->ggtt_vma);
> >  
> > diff --git a/drivers/gpu/drm/xe/display/xe_fb_pin.c b/drivers/gpu/drm/xe/display/xe_fb_pin.c
> > index e45a1e7a4670..739d9c019094 100644
> > --- a/drivers/gpu/drm/xe/display/xe_fb_pin.c
> > +++ b/drivers/gpu/drm/xe/display/xe_fb_pin.c
> > @@ -418,15 +418,15 @@ intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb,
> >  		     unsigned int alignment,
> >  		     unsigned int phys_alignment,
> >  		     unsigned int vtd_guard,
> > -		     bool uses_fence,
> > -		     unsigned long *out_flags)
> > +		     int *out_fence_id)
> >  {
> > -	*out_flags = 0;
> > +	if (out_fence_id)
> > +		*out_fence_id = -1;
> >  
> >  	return __xe_pin_fb_vma(to_intel_framebuffer(fb), view, alignment);
> >  }
> >  
> > -void intel_fb_unpin_vma(struct i915_vma *vma, unsigned long flags)
> > +void intel_fb_unpin_vma(struct i915_vma *vma, int fence_id)
> >  {
> >  	__xe_unpin_fb_vma(vma);
> >  }
> > diff --git a/drivers/gpu/drm/xe/display/xe_initial_plane.c b/drivers/gpu/drm/xe/display/xe_initial_plane.c
> > index 8bcae552dddc..09ec8f94bf57 100644
> > --- a/drivers/gpu/drm/xe/display/xe_initial_plane.c
> > +++ b/drivers/gpu/drm/xe/display/xe_initial_plane.c
> > @@ -153,7 +153,7 @@ xe_initial_plane_setup(struct drm_plane_state *_plane_state,
> >  	struct i915_vma *vma;
> >  
> >  	vma = intel_fb_pin_to_ggtt(fb, &plane_state->view.gtt,
> > -				   0, 0, 0, false, &plane_state->flags);
> > +				   0, 0, 0, NULL);
> >  	if (IS_ERR(vma))
> >  		return PTR_ERR(vma);
> 
> -- 
> Jani Nikula, Intel

-- 
Ville Syrjälä
Intel

Re: [PATCH 1/2] drm/i915: Track fence region ID in plane state

[Jani Nikula]

On Tue, 31 Mar 2026, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> @@ -203,7 +204,7 @@ intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb,
>  		ret = 0;
>  
>  		if (vma->fence)
> -			*out_flags |= PLANE_HAS_FENCE;
> +			*out_fence_id |= vma->fence->id;

That should obviously be an assignment rather than OR.

I was reviewing the recently enabled Sashiko LLM reviews, and it had
spotted this one [1].

> @@ -314,7 +314,7 @@ int intel_fbdev_driver_fbdev_probe(struct drm_fb_helper *helper,
>  				   fb->min_alignment, 0,
>  				   intel_fb_view_vtd_guard(&fb->base, &fb->normal_view,
>  							   DRM_MODE_ROTATE_0),
> -				   false, &flags);
> +				   &fence_id);

This might also change behaviour as previously uses_fence == false.

BR,
Jani.



[1] https://sashiko.dev/#/patchset/20260331162138.19258-1-ville.syrjala%40linux.intel.com



-- 
Jani Nikula, Intel

Re: [PATCH 1/2] drm/i915: Track fence region ID in plane state

[Ville Syrjälä]

On Thu, Apr 02, 2026 at 05:54:05PM +0300, Jani Nikula wrote:
> On Tue, 31 Mar 2026, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> > @@ -203,7 +204,7 @@ intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb,
> >  		ret = 0;
> >  
> >  		if (vma->fence)
> > -			*out_flags |= PLANE_HAS_FENCE;
> > +			*out_fence_id |= vma->fence->id;
> 
> That should obviously be an assignment rather than OR.
> 
> I was reviewing the recently enabled Sashiko LLM reviews, and it had
> spotted this one [1].
> 
> > @@ -314,7 +314,7 @@ int intel_fbdev_driver_fbdev_probe(struct drm_fb_helper *helper,
> >  				   fb->min_alignment, 0,
> >  				   intel_fb_view_vtd_guard(&fb->base, &fb->normal_view,
> >  							   DRM_MODE_ROTATE_0),
> > -				   false, &flags);
> > +				   &fence_id);
> 
> This might also change behaviour as previously uses_fence == false.

Hmm. Seems harmless but I guess we don't need the fence here at all.
If a fence is needed i915_vma_pin_iomap() will anyway grab one.
And even if we didn't iomap the thing intel_plane_pin_fb() would still
grab a fence if the display hardware needs it.

> 
> BR,
> Jani.
> 
> 
> 
> [1] https://sashiko.dev/#/patchset/20260331162138.19258-1-ville.syrjala%40linux.intel.com
> 
> 
> 
> -- 
> Jani Nikula, Intel

-- 
Ville Syrjälä
Intel