Commit bc40cf6d authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Jani Nikula
Browse files

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: 2b5a4562 ("drm/i915/display: Simplify GLK display version tests")
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210412054607.18133-3-ville.syrjala@linux.intel.com


(cherry picked from commit 0fe6637d)
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 604b5bc8

drivers/gpu/drm/i915/display/intel_display.c

+2 −1
Original line number Diff line number Diff line
@@ -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