Commit cfaf51ad authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2025-01-15' of... 

Merge tag 'drm-intel-fixes-2025-01-15' of https://gitlab.freedesktop.org/drm/i915/kernel

 into drm-fixes

- Relax clear color alignment to 64 bytes [fb] (Ville Syrjälä)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Tvrtko Ursulin <tursulin@igalia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/Z4fdIVf68qsqIpiN@linux
parents cf8182d3 1a5401ec

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

+1 −1
Original line number Diff line number Diff line
@@ -1694,7 +1694,7 @@ int intel_fill_fb_info(struct drm_i915_private *i915, struct intel_framebuffer * 
		 * arithmetic related to alignment and offset calculation.

		 */

		if (is_gen12_ccs_cc_plane(&fb->base, i)) {

			if (IS_ALIGNED(fb->base.offsets[i], PAGE_SIZE))

			if (IS_ALIGNED(fb->base.offsets[i], 64))

				continue;

			else

				return -EINVAL;