If the display is inactive, we need not worry about the gpu reset
clobbering the display!
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/i915/gt/intel_reset.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c
index b9d84d52e986..fe57296b790c 100644
--- a/drivers/gpu/drm/i915/gt/intel_reset.c
+++ b/drivers/gpu/drm/i915/gt/intel_reset.c
@@ -7,6 +7,7 @@
#include <linux/sched/mm.h>
#include <linux/stop_machine.h>
+#include "display/intel_display.h"
#include "display/intel_display_types.h"
#include "display/intel_overlay.h"
@@ -729,6 +730,21 @@ static void nop_submit_request(struct i915_request *request)
intel_engine_queue_breadcrumbs(engine);
}
+static bool reset_clobbers_display(struct drm_i915_private *i915)
+{
+ struct intel_crtc *crtc;
+
+ if (!INTEL_INFO(i915)->gpu_reset_clobbers_display)
+ return false;
+
+ for_each_intel_crtc(&i915->drm, crtc) {
+ if (crtc->active)
+ return true;
+ }
+
+ return false;
+}
+
static void __intel_gt_set_wedged(struct intel_gt *gt)
{
struct intel_engine_cs *engine;
@@ -755,7 +771,7 @@ static void __intel_gt_set_wedged(struct intel_gt *gt)
awake = reset_prepare(gt);
/* Even if the GPU reset fails, it should still stop the engines */
- if (!INTEL_INFO(gt->i915)->gpu_reset_clobbers_display)
+ if (!reset_clobbers_display(gt->i915))
__intel_gt_reset(gt, ALL_ENGINES);
for_each_engine(engine, gt->i915, id)
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
