On Mon, 2023-10-16 at 14:16 +0300, Jouni Högander wrote:
> Signed-off-by: Jouni Högander <jouni.hogander at intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_display_params.c | 4 ++++
> drivers/gpu/drm/i915/display/intel_display_params.h | 1 +
> drivers/gpu/drm/i915/display/intel_display_power.c | 12 ++++++------
> drivers/gpu/drm/i915/i915_params.c | 4 ----
> drivers/gpu/drm/i915/i915_params.h | 1 -
> 5 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_params.c b/drivers/gpu/drm/i915/display/intel_display_params.c
> index efc311837ff1..86b46cff1718 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_params.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_params.c
> @@ -53,6 +53,10 @@ intel_display_param_named_unsafe(enable_dpt, bool, 0400,
> intel_display_param_named_unsafe(enable_sagv, bool, 0600,
> "Enable system agent voltage/frequency scaling (SAGV) (default: true)");
>
> +intel_display_param_named_unsafe(disable_power_well, int, 0400,
> + "Disable display power wells when possible "
> + "(-1=auto [default], 0=power wells always on, 1=power wells disabled when possible)");
> +
> 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 06e920c9aa36..998f99a2857c 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_params.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_params.h
> @@ -31,6 +31,7 @@ struct drm_i915_private;
> param(int, enable_dc, -1, 0400) \
> param(bool, enable_dpt, true, 0400) \
> param(bool, enable_sagv, true, 0600) \
> + param(int, disable_power_well, -1, 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/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
> index 4832eb8da080..e390595d7341 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_power.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_power.c
> @@ -967,7 +967,7 @@ static u32 get_allowed_dc_mask(const struct drm_i915_private *dev_priv,
> DISPLAY_VER(dev_priv) >= 11 ?
> DC_STATE_EN_DC9 : 0;
>
> - if (!dev_priv->params.disable_power_well)
> + if (!dev_priv->display.params.disable_power_well)
> max_dc = 0;
>
> if (enable_dc >= 0 && enable_dc <= max_dc) {
> @@ -1016,9 +1016,9 @@ int intel_power_domains_init(struct drm_i915_private *dev_priv)
> {
> struct i915_power_domains *power_domains = &dev_priv->display.power.domains;
>
> - dev_priv->params.disable_power_well =
> + dev_priv->display.params.disable_power_well =
> sanitize_disable_power_well_option(dev_priv,
> - dev_priv->params.disable_power_well);
> + dev_priv->display.params.disable_power_well);
> power_domains->allowed_dc_mask =
> get_allowed_dc_mask(dev_priv, dev_priv->display.params.enable_dc);
>
> @@ -1950,7 +1950,7 @@ void intel_power_domains_init_hw(struct drm_i915_private *i915, bool resume)
> intel_display_power_get(i915, POWER_DOMAIN_INIT);
>
> /* Disable power support if the user asked so. */
> - if (!i915->params.disable_power_well) {
> + if (!i915->display.params.disable_power_well) {
> drm_WARN_ON(&i915->drm, power_domains->disable_wakeref);
> i915->display.power.domains.disable_wakeref = intel_display_power_get(i915,
> POWER_DOMAIN_INIT);
> @@ -1977,7 +1977,7 @@ void intel_power_domains_driver_remove(struct drm_i915_private *i915)
> fetch_and_zero(&i915->display.power.domains.init_wakeref);
>
> /* Remove the refcount we took to keep power well support disabled. */
> - if (!i915->params.disable_power_well)
> + if (!i915->display.params.disable_power_well)
> intel_display_power_put(i915, POWER_DOMAIN_INIT,
> fetch_and_zero(&i915->display.power.domains.disable_wakeref));
>
> @@ -2096,7 +2096,7 @@ void intel_power_domains_suspend(struct drm_i915_private *i915, bool s2idle)
> * Even if power well support was disabled we still want to disable
> * power wells if power domains must be deinitialized for suspend.
> */
> - if (!i915->params.disable_power_well)
> + if (!i915->display.params.disable_power_well)
> intel_display_power_put(i915, POWER_DOMAIN_INIT,
> fetch_and_zero(&i915->display.power.domains.disable_wakeref));
>
> diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
> index 51e706f6e57e..eab02f71a4e5 100644
> --- a/drivers/gpu/drm/i915/i915_params.c
> +++ b/drivers/gpu/drm/i915/i915_params.c
> @@ -86,10 +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_unsafe(disable_power_well, int, 0400,
> - "Disable display power wells when possible "
> - "(-1=auto [default], 0=power wells always on, 1=power wells disabled when possible)");
> -
> i915_param_named_unsafe(enable_ips, int, 0400, "Enable IPS (default: true)");
>
> i915_param_named_unsafe(load_detect_test, bool, 0400,
> diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
> index 066f15783580..060464df03c2 100644
> --- a/drivers/gpu/drm/i915/i915_params.h
> +++ b/drivers/gpu/drm/i915/i915_params.h
> @@ -47,7 +47,6 @@ struct drm_printer;
> */
> #define I915_PARAMS_FOR_EACH(param) \
> param(int, modeset, -1, 0400) \
> - param(int, disable_power_well, -1, 0400) \
> param(int, enable_ips, 1, 0600) \
> param(int, invert_brightness, 0, 0600) \
> param(int, enable_guc, -1, 0400) \
Reviewed-by: Luca Coelho <luciano.coelho at intel.com>
--
Cheers,
Luca.