Commit 5621e065 authored Oct 24, 2023 by Jouni Högander

drm/i915/display: Move enable_dpcd_backlight module parameter under display

Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231024124109.384973-17-jouni.hogander@intel.com

parent 87706a67

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -72,6 +72,10 @@ intel_display_param_named_unsafe(edp_vswing, int, 0400,
		"(0=use value from vbt [default], 1=low power swing(200mV),"
		"2=default swing(400mV))");

		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(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
		@@ -35,6 +35,7 @@ struct drm_i915_private;
		param(bool, enable_ips, true, 0600) \
		param(int, invert_brightness, 0, 0600) \
		param(int, edp_vswing, 0, 0400) \
		param(int, enable_dpcd_backlight, -1, 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_aux_backlight.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -146,7 +146,7 @@ intel_dp_aux_supports_hdr_backlight(struct intel_connector *connector)
		* HDR static metadata we need to start maintaining table of
		* ranges for such panels.
		*/
		if (i915->params.enable_dpcd_backlight != INTEL_DP_AUX_BACKLIGHT_FORCE_INTEL &&
		if (i915->display.params.enable_dpcd_backlight != INTEL_DP_AUX_BACKLIGHT_FORCE_INTEL &&
		!(connector->base.hdr_sink_metadata.hdmi_type1.metadata_type &
		BIT(HDMI_STATIC_METADATA_TYPE1))) {
		drm_info(&i915->drm,
		@@ -489,7 +489,7 @@ int intel_dp_aux_init_backlight_funcs(struct intel_connector *connector)
		/* Check the VBT and user's module parameters to figure out which
		* interfaces to probe
		*/
		switch (i915->params.enable_dpcd_backlight) {
		switch (i915->display.params.enable_dpcd_backlight) {
		case INTEL_DP_AUX_BACKLIGHT_OFF:
		return -ENODEV;
		case INTEL_DP_AUX_BACKLIGHT_AUTO:

drivers/gpu/drm/i915/i915_params.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -140,10 +140,6 @@ 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)");
		#endif

		i915_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)");

		#if IS_ENABLED(CONFIG_DRM_I915_GVT)
		i915_param_named(enable_gvt, bool, 0400,
		"Enable support for Intel GVT-g graphics virtualization host support(default:false)");

drivers/gpu/drm/i915/i915_params.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,6 @@ struct drm_printer;
		param(int, mmio_debug, -IS_ENABLED(CONFIG_DRM_I915_DEBUG_MMIO), 0600) \
		param(unsigned int, reset, 3, 0600) \
		param(unsigned int, inject_probe_failure, 0, 0) \
		param(int, enable_dpcd_backlight, -1, 0600) \
		param(char *, force_probe, CONFIG_DRM_I915_FORCE_PROBE, 0400) \
		param(unsigned int, request_timeout_ms, CONFIG_DRM_I915_REQUEST_TIMEOUT, CONFIG_DRM_I915_REQUEST_TIMEOUT ? 0600 : 0) \
		param(unsigned int, lmem_size, 0, 0400) \