From patchwork Fri Feb 3 11:50:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9553913 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7094A602B7 for ; Fri, 3 Feb 2017 11:50:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 624F827FAD for ; Fri, 3 Feb 2017 11:50:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5779B2847A; Fri, 3 Feb 2017 11:50:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1287627FAD for ; Fri, 3 Feb 2017 11:50:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C12A36EB62; Fri, 3 Feb 2017 11:50:41 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 56CB26EB62 for ; Fri, 3 Feb 2017 11:50:40 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id u63so3861080wmu.2 for ; Fri, 03 Feb 2017 03:50:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=CAluzizBtaXn4Www2mVx7i3wdhAqPbmPjUVbLWox9DI=; b=Ok04VajmoVxPirf8NoPJAeu8wYI7nSrJ0+GJwB95LArn96HGMskJCtTAzYWdV9gBdz t676jMeGNIvKKxI33eyHG01KBt9Ghawy7fYDkQWbaJ5KjEoGscNffs/nFtoMX9vHIDxh 1e5UtptSTe+7/3DRntre6RR1XgedzhynWypTaSusoKSd5kQlJ5e9TKzWhg4ZRs8BA5/U LvM3LWz5zBlGYvmgtN7K2HHalYS6+ZdEksyk1oEpK/eNjcbKYY6+PPPhMzU/5oUcGaMB YHJ42fVugsv/6gPiDk92HseQ8m2PBqjTtNKEW/t07HW+x2HCC7HCvCGh96o7V52CUK1u OLTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=CAluzizBtaXn4Www2mVx7i3wdhAqPbmPjUVbLWox9DI=; b=pbH0NpT/CMhp0JGPk7RapKvBothuzWkfOiltq4CMEMmGCoUOstwGg/aL+/Nxksm87f UvpQgJAso+LJXE3PGd8utwPZfuOpRgedCZ6SDmacINttjdP27G0pHz6hnJaXR+s7fUmc HfqxyyKesbUyBI+b65oZ8cfO6swbefWCI6AoGJsMWr3AAcG4E9UIgx/5DfX2MnFYdk6F 5+jFNEK47KmCZ/y2/s+G+dHFV3YkrwgtC/IgM7upe9ZSkYs2MLwSDi+6PRqq+h1JTbzv 9Y15ULpC445WBT2IKz8IiUVeOgpiPJKKXc9I/to+A8+MT3v94mAJ7LRr8FEIqlXKsDkx J+ew== X-Gm-Message-State: AMke39ny54mWXeenUc0nEmM3qaewQdMi3uNPgBu9vHEJxI+ir5LGidjx0JOrT/NIV+wb8g== X-Received: by 10.28.12.68 with SMTP id 65mr1093144wmm.100.1486122638935; Fri, 03 Feb 2017 03:50:38 -0800 (PST) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id k195sm2641560wmd.7.2017.02.03.03.50.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Feb 2017 03:50:38 -0800 (PST) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Fri, 3 Feb 2017 11:50:35 +0000 Message-Id: <20170203115036.24743-1-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.11.0 Subject: [Intel-gfx] [PATCH 1/2] drm/i915: Tidy the tail of i915_tiling_ok() X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP 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 Signed-off-by: Chris Wilson Cc: Tvrtko Ursulin Reviewed-by: Tvrtko Ursulin --- drivers/gpu/drm/i915/i915_gem_tiling.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c index a80f362d2ac1..62148396c796 100644 --- 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,