intel_display_reset_supported() is included in intel_display_reset_needed_after_gpu_reset(), so there's really no need to call both in intel_gt_reset_global(). Simplify, and make intel_display_reset_supported() static.
Note: For now, keep using intel_gt_gpu_reset_clobbers_display() in most places, although it's just a thin wrapper around intel_display_reset_needed_after_gpu_reset(). Cc: Ville Syrjälä <[email protected]> Cc: Maarten Lankhorst <[email protected]> Signed-off-by: Jani Nikula <[email protected]> --- drivers/gpu/drm/i915/display/intel_display_reset.c | 2 +- drivers/gpu/drm/i915/display/intel_display_reset.h | 1 - drivers/gpu/drm/i915/gt/intel_reset.c | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display_reset.c b/drivers/gpu/drm/i915/display/intel_display_reset.c index 6ec1af1c8431..323ca0e5e74f 100644 --- a/drivers/gpu/drm/i915/display/intel_display_reset.c +++ b/drivers/gpu/drm/i915/display/intel_display_reset.c @@ -18,7 +18,7 @@ #include "intel_hotplug.h" #include "intel_pps.h" -bool intel_display_reset_supported(struct intel_display *display) +static bool intel_display_reset_supported(struct intel_display *display) { return display && HAS_DISPLAY(display); } diff --git a/drivers/gpu/drm/i915/display/intel_display_reset.h b/drivers/gpu/drm/i915/display/intel_display_reset.h index 68312403904e..192ff8065a79 100644 --- a/drivers/gpu/drm/i915/display/intel_display_reset.h +++ b/drivers/gpu/drm/i915/display/intel_display_reset.h @@ -10,7 +10,6 @@ struct intel_display; -bool intel_display_reset_supported(struct intel_display *display); bool intel_display_reset_needed_after_gpu_reset(struct intel_display *display); bool intel_display_reset_test(struct intel_display *display); void intel_display_reset_prepare(struct intel_display *display); diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c index 439635bf94dd..1122354239f9 100644 --- a/drivers/gpu/drm/i915/gt/intel_reset.c +++ b/drivers/gpu/drm/i915/gt/intel_reset.c @@ -1424,8 +1424,7 @@ static void intel_gt_reset_global(struct intel_gt *gt, bool reset_display; need_display_reset = - intel_display_reset_supported(display) && - intel_gt_gpu_reset_clobbers_display(gt) && + intel_display_reset_needed_after_gpu_reset(display) && intel_has_gpu_reset(gt); reset_display = -- 2.47.3
