diff options
| author |   Ville Syrjälä <ville.syrjala@linux.intel.com> | 2021-04-12 08:46:04 +0300 |
|---|---|---|
| committer |   Jani Nikula <jani.nikula@intel.com> | 2021-04-14 12:32:17 +0300 |
| commit | 0fe6637d9852a33c2873e59ae7e5225f92ac4cc2 (patch) | |
| tree | 9dd90a4991f5aa903558c469c0c4861cbd1adc12 | |
| parent | drm/i915: Restore lost glk FBC 16bpp w/a (diff) | |
| download | wireguard-linux-0fe6637d9852a33c2873e59ae7e5225f92ac4cc2.tar.xz wireguard-linux-0fe6637d9852a33c2873e59ae7e5225f92ac4cc2.zip | |
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
Diffstat (limited to '')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_display.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 4f8f994a639f..00120697e59b 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -1403,7 +1403,8 @@ intel_fb_stride_alignment(const struct drm_framebuffer *fb, int color_plane) * require the entire fb to accommodate that to avoid * potential runtime errors at plane configuration time. */ - if (IS_DISPLAY_VER(dev_priv, 9) && color_plane == 0 && fb->width > 3840) + if ((IS_DISPLAY_VER(dev_priv, 9) || IS_GEMINILAKE(dev_priv)) && + color_plane == 0 && fb->width > 3840) tile_width *= 4; /* * The main surface pitch must be padded to a multiple of four |