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

diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c b/drivers/gpu/drm/i915/display/intel_display_device.c
index e80842d1e7c73d529ea2eeb38962ecc34d9a2797..50841818fb59f9c6b7efaf4d4abf231b12b5a237 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_device.c
+++ b/drivers/gpu/drm/i915/display/intel_display_device.c
@@ -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);
 }

diff --git a/drivers/gpu/drm/i915/display/intel_display_params.c b/drivers/gpu/drm/i915/display/intel_display_params.c
index a6f0dd9beb928cfbf70a7ea07e53a29a4d4fe60e..3579fa1fc5b77fd0dc660666f53adaa2c59ae369 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_params.c
+++ b/drivers/gpu/drm/i915/display/intel_display_params.c
@@ -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))");

diff --git a/drivers/gpu/drm/i915/display/intel_display_params.h b/drivers/gpu/drm/i915/display/intel_display_params.h
index 5f76dbd4b099bba10bef8488d0559679cdfd5236..8c4e0f6ac3e35612d3bc94f3cf4e466ed4865834 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_params.h
+++ b/drivers/gpu/drm/i915/display/intel_display_params.h
@@ -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) \

diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
index 497e39b1dcfb9d3693d798562ffd635aff149829..3205c6b626703911ce4b2b4c17959677946ff804 100644 (file)
--- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c
@@ -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)");
 

diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
index 9f3188b674e0080d69e500030491775bad8df1cc..8bce7d0576346e52fe6f182c3d0c92ee14e51f44 100644 (file)
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -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) \