[Intel-gfx] [PATCH] drm/i915: Moving scaler numbers to runtime init

[Chris Wilson]

On Tue, Nov 22, 2016 at 04:26:18PM +0530, Nabendu Maiti wrote:
> Numbers of scalers initialization is moved to runtime init for platform
> specific initialization.
> 
> Signed-off-by: Nabendu Maiti <nabendu.bikash.maiti at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_debugfs.c      |  2 +-
>  drivers/gpu/drm/i915/i915_drv.h          |  1 +
>  drivers/gpu/drm/i915/intel_device_info.c |  3 +++
>  drivers/gpu/drm/i915/intel_display.c     | 10 ++--------
>  drivers/gpu/drm/i915/intel_drv.h         |  4 ++--
>  5 files changed, 9 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index b7f42c4..8349abe 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -3080,7 +3080,7 @@ static void intel_scaler_info(struct seq_file *m, struct intel_crtc *intel_crtc)
>  			   pipe_config->scaler_state.scaler_users,
>  			   pipe_config->scaler_state.scaler_id);
>  
> -		for (i = 0; i < SKL_NUM_SCALERS; i++) {
> +		for (i = 0; i < num_scalers; i++) {
>  			struct intel_scaler *sc =
>  					&pipe_config->scaler_state.scalers[i];
>  
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index be67aee..6eed9c2 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -731,6 +731,7 @@ struct intel_device_info {
>  	u16 device_id;
>  	u8 num_pipes;
>  	u8 num_sprites[I915_MAX_PIPES];
> +	u8 num_scalers[I915_MAX_PIPES];
>  	u8 gen;
>  	u16 gen_mask;
>  	u8 ring_mask; /* Rings supported by the HW */
> diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
> index 185e3bb..9b8dc71 100644
> --- a/drivers/gpu/drm/i915/intel_device_info.c
> +++ b/drivers/gpu/drm/i915/intel_device_info.c
> @@ -282,6 +282,9 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
>  		info->num_sprites[PIPE_A] = 2;
>  		info->num_sprites[PIPE_B] = 2;
>  		info->num_sprites[PIPE_C] = 1;
> +		info->num_scalers[PIPE_A] = 2;
> +		info->num_scalers[PIPE_B] = 2;
> +		info->num_sprites[PIPE_C] = 1;

Since this contains a cut-n-paste typo that wasn't picked up by BAT,
please fix both.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre