Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ec4cf40 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Skip fence alignemnt check for the CCS plane 

The CCS won't have the same stride as the main surface anyway so trying
to guard against the fence stride not matching the CCS stride is
not sensible. Just skip the fence vs. fb alignment check for the aux
plane.

Cc: Ben Widawsky <ben@bwidawsk.net>
Cc: Jason Ekstrand <jason@jlekstrand.net>
Cc: Daniel Stone <daniels@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170824191100.10949-3-ville.syrjala@linux.intel.com


Reviewed-by: default avatarBen Widawsky <ben@bwidawsk.net>
Fixes: 2e2adb05 ("drm/i915: Add render decompression support")
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
parent 303ba695

drivers/gpu/drm/i915/intel_display.c

+1 −1
Original line number Diff line number Diff line
@@ -2589,7 +2589,7 @@ intel_fill_fb_info(struct drm_i915_private *dev_priv, 
		 * fb layout agrees with the fence layout. We already check that the

		 * fb stride matches the fence stride elsewhere.

		 */

		if (i915_gem_object_is_tiled(intel_fb->obj) &&

		if (i == 0 && i915_gem_object_is_tiled(intel_fb->obj) &&

		    (x + width) * cpp > fb->pitches[i]) {

			DRM_DEBUG_KMS("bad fb plane %d offset: 0x%x\n",

				      i, fb->offsets[i]);