[Intel-gfx] [PATCH 02/12] drm/i915: Skip fence alignemnt check for the CCS plane

[Ben Widawsky]

On 17-08-24 22:10:50, Ville Syrjälä wrote:
>From: Ville Syrjälä <ville.syrjala at linux.intel.com>
>
>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 at bwidawsk.net>
>Cc: Jason Ekstrand <jason at jlekstrand.net>
>Cc: Daniel Stone <daniels at collabora.com>
>Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
>---
> drivers/gpu/drm/i915/intel_display.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>index 6f47eaca07fb..a8809bc64475 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -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]);

Patch 1 is too much churn for my eyes to review, but it's
Acked-by: Ben Widawsky <ben at bwidawsk.net>

This one is
Reviewed-by: Ben Widawsky <ben at bwidawsk.net>

-- 
Ben Widawsky, Intel Open Source Technology Center