Commit 98a4784e authored by Jouni Högander's avatar Jouni Högander
Browse files

drm/i915/display: Move load_detect_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-18-jouni.hogander@intel.com
parent 5621e065

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

+2 −2
Original line number Diff line number Diff line
@@ -841,7 +841,7 @@ intel_crt_detect(struct drm_connector *connector, 
	if (!intel_display_device_enabled(dev_priv))

		return connector_status_disconnected;



	if (dev_priv->params.load_detect_test) {

	if (dev_priv->display.params.load_detect_test) {

		wakeref = intel_display_power_get(dev_priv,

						  intel_encoder->power_domain);

		goto load_detect;
@@ -901,7 +901,7 @@ intel_crt_detect(struct drm_connector *connector, 
		else if (DISPLAY_VER(dev_priv) < 4)

			status = intel_crt_load_detect(crt,

				to_intel_crtc(connector->state->crtc)->pipe);

		else if (dev_priv->params.load_detect_test)

		else if (dev_priv->display.params.load_detect_test)

			status = connector_status_disconnected;

		else

			status = connector_status_unknown;

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

+4 −0
Original line number Diff line number Diff line
@@ -76,6 +76,10 @@ intel_display_param_named(enable_dpcd_backlight, int, 0400, 
	"Enable support for DPCD backlight control"

	"(-1=use per-VBT LFP backlight type setting [default], 0=disabled, 1=enable, 2=force VESA interface, 3=force Intel interface)");



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(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
@@ -36,6 +36,7 @@ struct drm_i915_private; 
	param(int, invert_brightness, 0, 0600) \

	param(int, edp_vswing, 0, 0400) \

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

	param(bool, load_detect_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/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(load_detect_test, bool, 0400,

	"Force-enable the VGA load detect code for testing (default:false). "

	"For developers only.");



i915_param_named_unsafe(force_reset_modeset_test, bool, 0400,

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

	"For developers only.");

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, load_detect_test, false, 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) \