public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915/display: stop using the configurable fence timeout
@ 2025-11-12 15:56 Jani Nikula
  2025-11-12 20:39 ` ✓ i915.CI.BAT: success for " Patchwork
                   ` (5 more replies)
  0 siblings, 6 replies; 16+ messages in thread
From: Jani Nikula @ 2025-11-12 15:56 UTC (permalink / raw)
  To: intel-gfx, intel-xe
  Cc: jani.nikula, Maarten Lankhorst, Ville Syrjälä

i915 has the Kconfig option DRM_I915_FENCE_TIMEOUT, defaulting to 10
seconds. xe doesn't use it, instead defaulting to
MAX_SCHEDULE_TIMEOUT. Do the same for i915.

Cc: Maarten Lankhorst <dev@lankhorst.se>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

---

I am not sure about all the implications here. I'm just wondering if we
need to go through all the trouble of adding an interface to query this
from the parent driver.
---
 drivers/gpu/drm/i915/display/intel_display.c  |  4 +---
 .../drm/xe/compat-i915-headers/i915_config.h  | 19 -------------------
 2 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_config.h

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 6bca186608ce..cc502dfe8aff 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -49,7 +49,6 @@
 #include "g4x_dp.h"
 #include "g4x_hdmi.h"
 #include "hsw_ips.h"
-#include "i915_config.h"
 #include "i915_drv.h"
 #include "i915_reg.h"
 #include "i9xx_plane.h"
@@ -7150,7 +7149,6 @@ static void skl_commit_modeset_enables(struct intel_atomic_state *state)
 
 static void intel_atomic_commit_fence_wait(struct intel_atomic_state *intel_state)
 {
-	struct drm_i915_private *i915 = to_i915(intel_state->base.dev);
 	struct drm_plane *plane;
 	struct drm_plane_state *new_plane_state;
 	long ret;
@@ -7159,7 +7157,7 @@ static void intel_atomic_commit_fence_wait(struct intel_atomic_state *intel_stat
 	for_each_new_plane_in_state(&intel_state->base, plane, new_plane_state, i) {
 		if (new_plane_state->fence) {
 			ret = dma_fence_wait_timeout(new_plane_state->fence, false,
-						     i915_fence_timeout(i915));
+						     MAX_SCHEDULE_TIMEOUT);
 			if (ret <= 0)
 				break;
 
diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_config.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_config.h
deleted file mode 100644
index e835bea08d1b..000000000000
--- a/drivers/gpu/drm/xe/compat-i915-headers/i915_config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* SPDX-License-Identifier: MIT */
-/*
- * Copyright © 2023 Intel Corporation
- */
-
-#ifndef __I915_CONFIG_H__
-#define __I915_CONFIG_H__
-
-#include <linux/sched.h>
-
-struct drm_i915_private;
-
-static inline unsigned long
-i915_fence_timeout(const struct drm_i915_private *i915)
-{
-	return MAX_SCHEDULE_TIMEOUT;
-}
-
-#endif /* __I915_CONFIG_H__ */
-- 
2.47.3


^ permalink raw reply related	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2026-04-08 16:47 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-11-12 15:56 [PATCH] drm/i915/display: stop using the configurable fence timeout Jani Nikula
2025-11-12 20:39 ` ✓ i915.CI.BAT: success for " Patchwork
2025-11-12 22:54 ` ✗ i915.CI.Full: failure " Patchwork
2025-11-13 10:08 ` [PATCH] " Maarten Lankhorst
2025-11-13 15:53 ` [PATCH v2] " Jani Nikula
2025-11-13 23:24 ` ✓ i915.CI.BAT: success for drm/i915/display: stop using the configurable fence timeout (rev2) Patchwork
2025-11-14  7:53 ` ✗ i915.CI.Full: failure " Patchwork
2025-11-25 13:55   ` Jani Nikula
2025-11-25 17:24     ` Ville Syrjälä
2025-12-03 10:48       ` Maarten Lankhorst
2026-04-02  9:40         ` Jani Nikula
2026-04-02 15:41           ` Maarten Lankhorst
2026-04-08 15:14             ` Jani Nikula
2026-04-08 15:49               ` Maarten Lankhorst
2026-04-08 16:10                 ` Jani Nikula
2026-04-08 16:47                 ` Ville Syrjälä

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox