[Intel-gfx] [RFC 3/4] drm/i915: Initialize intel quirks before CDCLK initialization

[Jani Nikula]

On Mon, 02 Jan 2023, Chaitanya Kumar Borah <chaitanya.kumar.borah at intel.com> wrote:
> With addition of new quirk QUIRK_480MHZ_CDCLK_STEP, it is imperative
> that quirks should be initialized before CDCLK initialization. Refactor
> the code accordingly.

Any refactors here should improve the clarity between display and the
rest; this is going the opposite direction with calling display code
from common driver code.

BR,
Jani.


>
> Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah at intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_display.c | 2 --
>  drivers/gpu/drm/i915/i915_driver.c           | 2 ++
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index e75b9b2a0e01..5c71fd83c25b 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -8666,8 +8666,6 @@ int intel_modeset_init_noirq(struct drm_i915_private *i915)
>  	INIT_WORK(&i915->display.atomic_helper.free_work,
>  		  intel_atomic_helper_free_state_worker);
>  
> -	intel_init_quirks(i915);
> -
>  	intel_fbc_init(i915);
>  
>  	return 0;
> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
> index c1e427ba57ae..4d1cb46f9863 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -104,6 +104,7 @@
>  #include "intel_pm.h"
>  #include "intel_region_ttm.h"
>  #include "vlv_suspend.h"
> +#include "display/intel_quirks.h"
>  
>  static const struct drm_driver i915_drm_driver;
>  
> @@ -388,6 +389,7 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)
>  	if (ret < 0)
>  		goto err_gem;
>  	intel_irq_init(dev_priv);
> +	intel_init_quirks(dev_priv);
>  	intel_init_display_hooks(dev_priv);
>  	intel_init_clock_gating_hooks(dev_priv);

-- 
Jani Nikula, Intel Open Source Graphics Center