Commit 2c5d5ecd authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2026-05-06' of... 

Merge tag 'drm-intel-fixes-2026-05-06' of https://gitlab.freedesktop.org/drm/i915/kernel

 into drm-fixes

- Re-enable ccs modifiers on dg2 (Juha-Pekka Heikkila)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Tvrtko Ursulin <tursulin@igalia.com>
Link: https://patch.msgid.link/aftSjG1D0-hKISDy@linux
parents 7fd2df20 aab3d205

drivers/gpu/drm/i915/i915_driver.c

+2 −3
Original line number Diff line number Diff line
@@ -750,9 +750,8 @@ static bool has_auxccs(struct drm_device *drm) 
{

	struct drm_i915_private *i915 = to_i915(drm);



	return IS_GRAPHICS_VER(i915, 9, 12) ||

	       IS_ALDERLAKE_P(i915) ||

	       IS_METEORLAKE(i915);

	return IS_GRAPHICS_VER(i915, 9, 12) &&

		!HAS_FLAT_CCS(i915);

}



static bool has_fenced_regions(struct drm_device *drm)