drm/i915: Restore lost glk ccs w/a

We lost a CCS related w/a on glk when the display version
became 10 instead of 9. Restore the correct check.

Cc: Matt Roper <matthew.d.roper@intel.com>
Fixes: 2b5a4562edd0 ("drm/i915/display: Simplify GLK display version tests")
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210412054607.18133-3-ville.syrjala@linux.intel.com
(cherry picked from commit 0fe6637d9852a33c2873e59ae7e5225f92ac4cc2)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

authored by

Ville Syrjälä and committed by
Jani Nikula
bc40cf6d 604b5bc8

+2 -1
+2 -1
drivers/gpu/drm/i915/display/intel_display.c
··· 1403 1403 * require the entire fb to accommodate that to avoid 1404 1404 * potential runtime errors at plane configuration time. 1405 1405 */ 1406 - if (IS_DISPLAY_VER(dev_priv, 9) && color_plane == 0 && fb->width > 3840) 1406 + if ((IS_DISPLAY_VER(dev_priv, 9) || IS_GEMINILAKE(dev_priv)) && 1407 + color_plane == 0 && fb->width > 3840) 1407 1408 tile_width *= 4; 1408 1409 /* 1409 1410 * The main surface pitch must be padded to a multiple of four