Commit 8d3265a7 authored by Jouni Högander's avatar Jouni Högander
Browse files

drm/i915/display: Move enable_dp_mst 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-24-jouni.hogander@intel.com
parent 192a4444

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

+3 −0
Original line number Diff line number Diff line
@@ -93,6 +93,9 @@ intel_display_param_named(verbose_state_checks, bool, 0400, 
intel_display_param_named_unsafe(nuclear_pageflip, bool, 0400,

	"Force enable atomic functionality on platforms that don't have full support yet.");



intel_display_param_named_unsafe(enable_dp_mst, bool, 0400,

	"Enable multi-stream transport (MST) for new DisplayPort sinks. (default: true)");



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
@@ -41,6 +41,7 @@ struct drm_i915_private; 
	param(bool, disable_display, false, 0400) \

	param(bool, verbose_state_checks, true, 0400) \

	param(bool, nuclear_pageflip, false, 0400) \

	param(bool, enable_dp_mst, true, 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_dp.c

+3 −3
Original line number Diff line number Diff line
@@ -3771,7 +3771,7 @@ intel_dp_can_mst(struct intel_dp *intel_dp) 
{

	struct drm_i915_private *i915 = dp_to_i915(intel_dp);



	return i915->params.enable_dp_mst &&

	return i915->display.params.enable_dp_mst &&

		intel_dp_mst_source_support(intel_dp) &&

		drm_dp_read_mst_cap(&intel_dp->aux, intel_dp->dpcd);

}
@@ -3789,13 +3789,13 @@ intel_dp_configure_mst(struct intel_dp *intel_dp) 
		    encoder->base.base.id, encoder->base.name,

		    str_yes_no(intel_dp_mst_source_support(intel_dp)),

		    str_yes_no(sink_can_mst),

		    str_yes_no(i915->params.enable_dp_mst));

		    str_yes_no(i915->display.params.enable_dp_mst));



	if (!intel_dp_mst_source_support(intel_dp))

		return;



	intel_dp->is_mst = sink_can_mst &&

		i915->params.enable_dp_mst;

		i915->display.params.enable_dp_mst;



	drm_dp_mst_topology_mgr_set_mst(&intel_dp->mst_mgr,

					intel_dp->is_mst);

drivers/gpu/drm/i915/i915_params.c

+0 −3
Original line number Diff line number Diff line
@@ -114,9 +114,6 @@ i915_param_named_unsafe(dmc_firmware_path, charp, 0400, 
i915_param_named_unsafe(gsc_firmware_path, charp, 0400,

	"GSC firmware path to use instead of the default one");



i915_param_named_unsafe(enable_dp_mst, bool, 0400,

	"Enable multi-stream transport (MST) for new DisplayPort sinks. (default: true)");



#if IS_ENABLED(CONFIG_DRM_I915_DEBUG)

i915_param_named_unsafe(inject_probe_failure, uint, 0400,

	"Force an error after a number of failure check points (0:disabled (default), N:force failure at the Nth failure check point)");

drivers/gpu/drm/i915/i915_params.h

+0 −1
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ struct drm_printer; 
	/* leave bools at the end to not create holes */ \

	param(bool, enable_hangcheck, true, 0600) \

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

	param(bool, enable_dp_mst, true, 0600) \

	param(bool, enable_gvt, false, IS_ENABLED(CONFIG_DRM_I915_GVT) ? 0400 : 0)



#define MEMBER(T, member, ...) T member;