]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
drm/i915: switch num_scalers/num_sprites to consider DISPLAY_VER
authorLucas De Marchi <lucas.demarchi@intel.com>
Wed, 28 Jul 2021 21:59:43 +0000 (14:59 -0700)
committerLucas De Marchi <lucas.demarchi@intel.com>
Fri, 30 Jul 2021 17:19:47 +0000 (10:19 -0700)
commit4c6b3021217fb197606c51ff9b9a3af9b2a56481
treee4299bdffad6985366f3f6384028c01c2a653a2b
parent244dba4cb596379d0e196b031065f8c1e1cecdaf
drm/i915: switch num_scalers/num_sprites to consider DISPLAY_VER

The numbers of scalers and sprites depend on the display version, so use
it instead of GRAPHICS_VER. We were mixing both, which let me confused
while removing CNL and GRAPHICS_VER == 10.

v2 (Rodrigo): Switch IS_GEMINILAKE to DISPLAY_VER == 10
v3 (Lucas): Change check to DISPLAY_VER >= 9, to cover the GLK's num_scalers,
otherwise it remains set to 0.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210728215946.1573015-23-lucas.demarchi@intel.com
drivers/gpu/drm/i915/intel_device_info.c