diff options
| author |   Nabendu Maiti <nabendu.bikash.maiti@intel.com> | 2016-11-29 11:23:14 +0530 |
|---|---|---|
| committer |   Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> | 2017-01-02 14:58:02 +0200 |
| commit | 1c74eeaf16b8901b9bdb1901e1a8533a2281845a (patch) | |
| tree | f7c0b183193ad1aed3a97ca426492afbc0eac5f4 /drivers/gpu/drm/i915/intel_device_info.c | |
| parent | drm/i915: Move intel_atomic_get_shared_dpll_state() to intel_dpll_mgr.c (diff) | |
| download | linux-dev-1c74eeaf16b8901b9bdb1901e1a8533a2281845a.tar.xz linux-dev-1c74eeaf16b8901b9bdb1901e1a8533a2281845a.zip | |
drm/i915: Move number of scalers initialization to runtime init
In future patches, we require greater flexibility in describing
the number of scalers available on each CRTC. To ease that transition
we move the current assignment to intel_device_info.
Scaler structure initialisation is done if scaler is available on the CRTC.
Gen9 check is not required as on depending upon numbers of scalers we
initialize scalers or return without doing anything in skl_init_scalers.
v3: Changed skl_init_scaler to intel_crtc_init_scalers
v2: Added Chris's comments.
Signed-off-by: Nabendu Maiti <nabendu.bikash.maiti@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (v2)
Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1480398794-22741-1-git-send-email-nabendu.bikash.maiti@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_device_info.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_device_info.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c index c46415b8c1b9..1b5ffc4b63b2 100644 --- a/drivers/gpu/drm/i915/intel_device_info.c +++ b/drivers/gpu/drm/i915/intel_device_info.c @@ -325,6 +325,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_scalers[PIPE_C] = 1; } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) { for_each_pipe(dev_priv, pipe) info->num_sprites[pipe] = 2; |