Commit fddbcd15 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/reset: add intel_display_reset_test() 



Add a helper for checking if we want to test display reset regardless of
whether it's strictly necessary. This will come in handy in follow-up
work where we want to check this from gt reset side.

v2: Drop superfluous newline

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/487dec72f753302cd565c3a8164afa7fc1e12ed7.1741001054.git.jani.nikula@intel.com


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

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

+6 −1
Original line number Diff line number Diff line
@@ -22,6 +22,11 @@ static bool gpu_reset_clobbers_display(struct intel_display *display) 
		intel_has_gpu_reset(to_gt(i915)));

}



bool intel_display_reset_test(struct intel_display *display)

{

	return display->params.force_reset_modeset_test;

}



void intel_display_reset_prepare(struct intel_display *display)

{

	struct drm_i915_private *dev_priv = to_i915(display->drm);
@@ -33,7 +38,7 @@ void intel_display_reset_prepare(struct intel_display *display) 
		return;



	/* reset doesn't touch the display */

	if (!display->params.force_reset_modeset_test &&

	if (!intel_display_reset_test(display) &&

	    !gpu_reset_clobbers_display(display))

		return;

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

+3 −0
Original line number Diff line number Diff line
@@ -6,8 +6,11 @@ 
#ifndef __INTEL_RESET_H__

#define __INTEL_RESET_H__



#include <linux/types.h>



struct intel_display;



bool intel_display_reset_test(struct intel_display *display);

void intel_display_reset_prepare(struct intel_display *display);

void intel_display_reset_finish(struct intel_display *display);