From patchwork Sat Jul 21 09:06:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dhinakaran Pandiyan X-Patchwork-Id: 10538605 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 86962602F1 for ; Sat, 21 Jul 2018 09:06:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 859A428C29 for ; Sat, 21 Jul 2018 09:06:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6071528EEA; Sat, 21 Jul 2018 09:06:24 +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=-5.2 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED 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 EE4C628C29 for ; Sat, 21 Jul 2018 09:06:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 01EBC6E0A9; Sat, 21 Jul 2018 09:06:23 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) by gabe.freedesktop.org (Postfix) with ESMTPS id 51D006E0A9 for ; Sat, 21 Jul 2018 09:06:21 +0000 (UTC) Received: by mail-pg1-x541.google.com with SMTP id k3-v6so8755566pgq.5 for ; Sat, 21 Jul 2018 02:06:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NXzv32eQlX7iI4Q9Iitvi3hOyKBMxPNkDS12eEb7Bzc=; b=rWR4hBKyxI991/Sioz0tzAtbvtSX0+1pMtN2fJTLv2eBWS3b6EXz4Sprlx09wE+LBx 8W4vEpX47pImkv7E9sPt4egtstnNmnhaf8o3a49E5rJiks8bgnkBk77LOS8JDPTQf2yK zu1Yj+t3fEtYP1eLrUg3+tTd2WjqeNgRIIjjD0Zq8WEmilOz/GBho0yMNtGmiDhZdKJO ncBJ9PgJ+APWTOzx37XvLHKi2WVC5fWO+XfV5lrcLoD2Pjkzp7yz+1ALiYmUOB9lJlQW f3NPSi6ScmVAs6AEzngUUEcYMny0F2ckMv++34J85VZNHqvBOVz4PtnnwaJpWDeImbjc ehmQ== X-Gm-Message-State: AOUpUlHwsjPIFFPeF0qaBrcC9ByzMupEK5TISdxftCbE19/FosJ5SSrA BYNFc5I6IBC1wuCi9Yx4Kx9ekGJt X-Google-Smtp-Source: AAOMgpdqE1qPKOx5NPgXOvzRvSmn1L5PDKxLVZhivw5Hq/nQIUfaiHH3ZbrOsURegl1wleXhcQfLeg== X-Received: by 2002:a65:5307:: with SMTP id m7-v6mr5075949pgq.431.1532163980573; Sat, 21 Jul 2018 02:06:20 -0700 (PDT) Received: from dk-ThinkPad-X260.fios-router.home (50-39-164-98.bvtn.or.frontiernet.net. [50.39.164.98]) by smtp.gmail.com with ESMTPSA id j5-v6sm4498783pgp.6.2018.07.21.02.06.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Jul 2018 02:06:19 -0700 (PDT) From: Dhinakaran Pandiyan X-Google-Original-From: Dhinakaran Pandiyan To: intel-gfx@lists.freedesktop.org Date: Sat, 21 Jul 2018 02:06:07 -0700 Message-Id: <20180721090607.7535-1-dhinakaran.pandiyan@intel.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH] drm/i915: Fix gen-2 check for 128B tiling X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dhinakaran Pandiyan Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP intel_tile_width_bytes() returns 128B for gen-2 y-tiled buffers while at the same time HAS_128_BYTE_Y_TILING() returns false for gen-2. I am assuming intel_tile_width_bytes() does the right thing. Cc: Chris Wilson Cc: Ville Syrjälä Signed-off-by: Dhinakaran Pandiyan --- drivers/gpu/drm/i915/i915_drv.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 0f49f9988dfa..9b8a4f57a28c 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2556,9 +2556,8 @@ intel_info(const struct drm_i915_private *dev_priv) /* With the 945 and later, Y tiling got adjusted so that it was 32 128-byte * rows, which changed the alignment requirements and fence programming. */ -#define HAS_128_BYTE_Y_TILING(dev_priv) (!IS_GEN2(dev_priv) && \ - !(IS_I915G(dev_priv) || \ - IS_I915GM(dev_priv))) +#define HAS_128_BYTE_Y_TILING(dev_priv) (!(IS_I915G(dev_priv) || \ + IS_I915GM(dev_priv))) #define SUPPORTS_TV(dev_priv) ((dev_priv)->info.supports_tv) #define I915_HAS_HOTPLUG(dev_priv) ((dev_priv)->info.has_hotplug)