Commit 1f3f5eb3 authored by Jouni Högander's avatar Jouni Högander
Browse files

drm/i915/display: Move force_reset_modeset_test parameter under display 



Signed-off-by: default avatarJouni Högander <jouni.hogander@intel.com>
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231024124109.384973-19-jouni.hogander@intel.com
parent 98a4784e

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

+4 −0
Original line number Diff line number Diff line
@@ -80,6 +80,10 @@ intel_display_param_named_unsafe(load_detect_test, bool, 0400, 
	"Force-enable the VGA load detect code for testing (default:false). "

	"For developers only.");



intel_display_param_named_unsafe(force_reset_modeset_test, bool, 0400,

	"Force a modeset during gpu reset for testing (default:false). "

	"For developers only.");



intel_display_param_named_unsafe(enable_fbc, int, 0400,

	"Enable frame buffer compression for power savings "

	"(default: -1 (use per-chip default))");

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

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ struct drm_i915_private; 
	param(int, edp_vswing, 0, 0400) \

	param(int, enable_dpcd_backlight, -1, 0600) \

	param(bool, load_detect_test, false, 0600) \

	param(bool, force_reset_modeset_test, false, 0600) \

	param(int, enable_fbc, -1, 0600) \

	param(int, enable_psr, -1, 0600) \

	param(bool, psr_safest_params, false, 0400) \

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

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ void intel_display_reset_prepare(struct drm_i915_private *dev_priv) 
		return;



	/* reset doesn't touch the display */

	if (!dev_priv->params.force_reset_modeset_test &&

	if (!dev_priv->display.params.force_reset_modeset_test &&

	    !gpu_reset_clobbers_display(dev_priv))

		return;

drivers/gpu/drm/i915/i915_params.c

+0 −4
Original line number Diff line number Diff line
@@ -86,10 +86,6 @@ i915_param_named_unsafe(force_probe, charp, 0400, 
	"Force probe options for specified supported devices. "

	"See CONFIG_DRM_I915_FORCE_PROBE for details.");



i915_param_named_unsafe(force_reset_modeset_test, bool, 0400,

	"Force a modeset during gpu reset for testing (default:false). "

	"For developers only.");



i915_param_named(disable_display, bool, 0400,

	"Disable display (default: false)");

drivers/gpu/drm/i915/i915_params.h

+0 −1
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ struct drm_printer; 
	param(unsigned int, lmem_bar_size, 0, 0400) \

	/* leave bools at the end to not create holes */ \

	param(bool, enable_hangcheck, true, 0600) \

	param(bool, force_reset_modeset_test, false, 0600) \

	param(bool, error_capture, true, IS_ENABLED(CONFIG_DRM_I915_CAPTURE_ERROR) ? 0600 : 0) \

	param(bool, disable_display, false, 0400) \

	param(bool, verbose_state_checks, true, 0) \