drm/i915: Tidy the tail of i915_tiling_ok()

The current tail breaks the pattern of if (check) return false, which
can catch the reader out. If we move the gen2/3 power-of-two test into
the earlier gen2/3 branch, we can eliminate the contrary tail.

Suggested-by: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170203115036.24743-1-chris@chris-wilson.co.uk
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>

diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c
index 974ac08df473155f6d9195ecda0f7ba343ae7cec..152bed2dcb11a879c5a685074be34954acadfbca 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_tiling.c
+++ b/drivers/gpu/drm/i915/i915_gem_tiling.c
@@ -158,6 +158,9 @@ i915_tiling_ok(struct drm_i915_gem_object *obj,
                if (stride > 8192)
                        return false;
 
+               if (!is_power_of_2(stride))
+                       return false;
+
                if (IS_GEN3(i915)) {
                        if (obj->base.size > I830_FENCE_MAX_SIZE_VAL << 20)
                                return false;
@@ -176,12 +179,7 @@ i915_tiling_ok(struct drm_i915_gem_object *obj,
        if (!stride || !IS_ALIGNED(stride, tile_width))
                return false;
 
-       /* 965+ just needs multiples of tile width */
-       if (INTEL_GEN(i915) >= 4)
-               return true;
-
-       /* Pre-965 needs power of two tile widths */
-       return is_power_of_2(stride);
+       return true;
 }
 
 static bool i915_vma_fence_prepare(struct i915_vma *vma,