Commit 916f2740 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/reset: add modeset_stuck callback to intel_display_reset_prepare() 



Drop the dependency on gt by providing a callback for trying to unbreak
stuck modeset. Do intel_gt_set_wedged() via the callback.

It's by no means pretty, but this is perhaps the most straightforward
alternative.

Cc: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/d322e20927326afa47c0df8a4d4776ee77010e6d.1741001054.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent d1b97b12

drivers/gpu/drm/i915/display/intel_display_reset.c

+3 −3
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ bool intel_display_reset_test(struct intel_display *display) 
}



/* returns true if intel_display_reset_finish() needs to be called */

bool intel_display_reset_prepare(struct intel_display *display)

bool intel_display_reset_prepare(struct intel_display *display,

				 modeset_stuck_fn modeset_stuck, void *context)

{

	struct drm_i915_private *dev_priv = to_i915(display->drm);

	struct drm_modeset_acquire_ctx *ctx = &display->restore.reset_ctx;

	struct drm_atomic_state *state;

	int ret;
@@ -33,7 +33,7 @@ bool intel_display_reset_prepare(struct intel_display *display) 
	if (atomic_read(&display->restore.pending_fb_pin)) {

		drm_dbg_kms(display->drm,

			    "Modeset potentially stuck, unbreaking through wedging\n");

		intel_gt_set_wedged(to_gt(dev_priv));

		modeset_stuck(context);

	}



	/*

drivers/gpu/drm/i915/display/intel_display_reset.h

+4 −1
Original line number Diff line number Diff line
@@ -10,8 +10,11 @@ 


struct intel_display;



typedef void modeset_stuck_fn(void *context);



bool intel_display_reset_test(struct intel_display *display);

bool intel_display_reset_prepare(struct intel_display *display);

bool intel_display_reset_prepare(struct intel_display *display,

				 modeset_stuck_fn modeset_stuck, void *context);

void intel_display_reset_finish(struct intel_display *display, bool test_only);



#endif /* __INTEL_RESET_H__ */

drivers/gpu/drm/i915/gt/intel_reset.c

+8 −1
Original line number Diff line number Diff line
@@ -1403,6 +1403,11 @@ int intel_engine_reset(struct intel_engine_cs *engine, const char *msg) 
	return err;

}



static void display_reset_modeset_stuck(void *gt)

{

	intel_gt_set_wedged(gt);

}



static void intel_gt_reset_global(struct intel_gt *gt,

				  u32 engine_mask,

				  const char *reason)
@@ -1432,7 +1437,9 @@ static void intel_gt_reset_global(struct intel_gt *gt, 
			need_display_reset;



		if (reset_display)

			reset_display = intel_display_reset_prepare(display);

			reset_display = intel_display_reset_prepare(display,

								    display_reset_modeset_stuck,

								    gt);



		intel_gt_reset(gt, engine_mask, reason);