mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-04-30 20:30:32 -04:00
drm/i915/display: Move disable_display 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-20-jouni.hogander@intel.com
This commit is contained in:
@@ -1153,5 +1153,6 @@ bool intel_display_device_enabled(struct drm_i915_private *i915)
|
||||
/* Only valid when HAS_DISPLAY() is true */
|
||||
drm_WARN_ON(&i915->drm, !HAS_DISPLAY(i915));
|
||||
|
||||
return !i915->params.disable_display && !intel_opregion_headless_sku(i915);
|
||||
return !i915->display.params.disable_display &&
|
||||
!intel_opregion_headless_sku(i915);
|
||||
}
|
||||
|
||||
@@ -84,6 +84,9 @@ 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(disable_display, bool, 0400,
|
||||
"Disable display (default: false)");
|
||||
|
||||
intel_display_param_named_unsafe(enable_fbc, int, 0400,
|
||||
"Enable frame buffer compression for power savings "
|
||||
"(default: -1 (use per-chip default))");
|
||||
|
||||
@@ -38,6 +38,7 @@ struct drm_i915_private;
|
||||
param(int, enable_dpcd_backlight, -1, 0600) \
|
||||
param(bool, load_detect_test, false, 0600) \
|
||||
param(bool, force_reset_modeset_test, false, 0600) \
|
||||
param(bool, disable_display, false, 0400) \
|
||||
param(int, enable_fbc, -1, 0600) \
|
||||
param(int, enable_psr, -1, 0600) \
|
||||
param(bool, psr_safest_params, false, 0400) \
|
||||
|
||||
@@ -86,9 +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(disable_display, bool, 0400,
|
||||
"Disable display (default: false)");
|
||||
|
||||
i915_param_named(memtest, bool, 0400,
|
||||
"Perform a read/write test of all device memory on module load (default: off)");
|
||||
|
||||
|
||||
@@ -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, disable_display, false, 0400) \
|
||||
param(bool, verbose_state_checks, true, 0) \
|
||||
param(bool, nuclear_pageflip, false, 0400) \
|
||||
param(bool, enable_dp_mst, true, 0600) \
|
||||
|
||||
Reference in New Issue
Block a user