On Mon, 2023-10-16 at 14:16 +0300, Jouni Högander wrote: > Signed-off-by: Jouni Högander <jouni.hogander@xxxxxxxxx> > --- > drivers/gpu/drm/i915/display/intel_display_device.c | 3 ++- > drivers/gpu/drm/i915/display/intel_display_params.c | 3 +++ > drivers/gpu/drm/i915/display/intel_display_params.h | 1 + > drivers/gpu/drm/i915/i915_params.c | 3 --- > drivers/gpu/drm/i915/i915_params.h | 2 -- > 5 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c b/drivers/gpu/drm/i915/display/intel_display_device.c > index e80842d1e7c7..50841818fb59 100644 > --- 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 7f330a5e1188..06e68c7fec1c 100644 > --- 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 25f238e63ff8..60d9c3d59fe4 100644 > --- 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 497e39b1dcfb..3205c6b62670 100644 > --- 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 5fa77ecb8d31..8bce7d057634 100644 > --- a/drivers/gpu/drm/i915/i915_params.h > +++ b/drivers/gpu/drm/i915/i915_params.h > @@ -63,9 +63,7 @@ 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, 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) \ > param(bool, verbose_state_checks, true, 0) \ > param(bool, nuclear_pageflip, false, 0400) \ > param(bool, enable_dp_mst, true, 0600) \ Reviewed-by: Luca Coelho <luciano.coelho@xxxxxxxxx> -- Cheers, Luca.
