From 95099d4622f8cb224d94e314c7a8e0df60b13f87 Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Sat, 09 Dec 2023 08:38:01 +0000
Subject: [PATCH] enable docker ppp
---
kernel/drivers/gpu/drm/i915/selftests/igt_flush_test.c | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/kernel/drivers/gpu/drm/i915/selftests/igt_flush_test.c b/kernel/drivers/gpu/drm/i915/selftests/igt_flush_test.c
index af66e3d..7b0939e 100644
--- a/kernel/drivers/gpu/drm/i915/selftests/igt_flush_test.c
+++ b/kernel/drivers/gpu/drm/i915/selftests/igt_flush_test.c
@@ -4,30 +4,32 @@
* Copyright © 2018 Intel Corporation
*/
-#include "../i915_drv.h"
+#include "gt/intel_gt.h"
+#include "gt/intel_gt_requests.h"
-#include "../i915_selftest.h"
+#include "i915_drv.h"
+#include "i915_selftest.h"
+
#include "igt_flush_test.h"
-int igt_flush_test(struct drm_i915_private *i915, unsigned int flags)
+int igt_flush_test(struct drm_i915_private *i915)
{
+ struct intel_gt *gt = &i915->gt;
+ int ret = intel_gt_is_wedged(gt) ? -EIO : 0;
+
cond_resched();
- if (flags & I915_WAIT_LOCKED &&
- i915_gem_switch_to_kernel_context(i915)) {
- pr_err("Failed to switch back to kernel context; declaring wedged\n");
- i915_gem_set_wedged(i915);
- }
-
- if (i915_gem_wait_for_idle(i915, flags, HZ / 5) == -ETIME) {
+ if (intel_gt_wait_for_idle(gt, HZ / 5) == -ETIME) {
pr_err("%pS timed out, cancelling all further testing.\n",
__builtin_return_address(0));
- GEM_TRACE("%pS timed out.\n", __builtin_return_address(0));
+ GEM_TRACE("%pS timed out.\n",
+ __builtin_return_address(0));
GEM_TRACE_DUMP();
- i915_gem_set_wedged(i915);
+ intel_gt_set_wedged(gt);
+ ret = -EIO;
}
- return i915_terminally_wedged(&i915->gpu_error) ? -EIO : 0;
+ return ret;
}
--
Gitblit v1.6.2