diff --git a/drivers/gpu/drm/i915/i915_gem_fence.c b/drivers/gpu/drm/i915/i915_gem_fence.c
index 598198543dcd..4f530345ad8c 100644
--- a/drivers/gpu/drm/i915/i915_gem_fence.c
+++ b/drivers/gpu/drm/i915/i915_gem_fence.c
@@ -642,7 +642,7 @@ i915_gem_detect_bit_6_swizzle(struct drm_device *dev)
        }

        /* check for L-shaped memory aka modified enhanced addressing */
-       if (IS_GEN4(dev) &&
+       if ((IS_GEN3(dev) || IS_GEN4(dev)) &&
            !(I915_READ(DCC2) & DCC2_MODIFIED_ENHANCED_DISABLE)) {
            swizzle_x = I915_BIT_6_SWIZZLE_UNKNOWN;
            swizzle_y = I915_BIT_6_SWIZZLE_UNKNOWN;