From patchwork Tue Mar 8 14:51:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 8534951 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C404DC0553 for ; Tue, 8 Mar 2016 14:52:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F3C62200DF for ; Tue, 8 Mar 2016 14:52:25 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 42AA9200D4 for ; Tue, 8 Mar 2016 14:52:25 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0F7686E6F9; Tue, 8 Mar 2016 14:52:24 +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 6C8F86E6EE for ; Tue, 8 Mar 2016 14:52:15 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id 1so4545721wmg.2 for ; Tue, 08 Mar 2016 06:52:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=TZ78egAaXSCyiCIZRABWjpaygTYbCdepNuS4dnYpGPY=; b=SgHk9AVcjiQy5HeYbM3EWbwcFdUcuLOVlmWnxGvEWpTbjcafLeZz7YkyRwF6wxof/2 IntCYmHZyv4IQzWzGpqVmam5+QdIpiysN8Bk/OnhCovPToaBRXK/sLK3IiR3m1/z/CNY /DrTuXxzJb0F5HHfEdlkEbSa+lvoJOkjq7PPbaFyhKyA+5SmOdcx8v2iE6GyfKApis75 eF52H+ERgE8XfvAqJyFyFKsAQJypSUczwSfr8oN7Aqr6Ba8Z5iNfSrhMmyoRWIKy83xq GGFUFNSDIhCaXkRh7Xb5bWtVoUSyJh13BUGHWsZ8F7RBswQ60ViO7OX07aqHMw9D9HdB dPXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=TZ78egAaXSCyiCIZRABWjpaygTYbCdepNuS4dnYpGPY=; b=a4HWbyt0A7d1+XA+TItOeKOPUuZKBX/qqg+KS1xo79dZt84LG+luUtHROlvYjD1/l3 m/mY33UhahI6GrOxNcMu/hN1kN9T8LCNIWxWPEa9gXNluSEZxtLeKlG6NX+kWgbiWVb8 W+lyjQ0IWClmEgHVF/5qAOMiHlfD3mZNA3Jv8F1ALXv6yJFr1Ip7/jCA+zcPceE0h4YB iqOaFvRV2D7F8VD7iIJEWWS4eLoKjAwwFpDemBtYK6gaNM24y/poHZM1lN+FWATylDxE UCiDeyV8uj2UThSGCcZX+B9eyomSuO2UyeQv86nlQm3AkkkPbl3kZ/He90GW+GkCbt02 aKtg== X-Gm-Message-State: AD7BkJIB7nKuw7hcMnFidiurTn17OrcR+JekbqMQmWt5Q2oMZMKvfgFPpjYHkpjkJ3lIVg== X-Received: by 10.194.85.161 with SMTP id i1mr32775047wjz.95.1457448733713; Tue, 08 Mar 2016 06:52:13 -0800 (PST) Received: from cizrna.lan ([109.72.12.208]) by smtp.gmail.com with ESMTPSA id 3sm3781979wmp.14.2016.03.08.06.52.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Mar 2016 06:52:12 -0800 (PST) From: Tomeu Vizoso To: Intel GFX discussion Date: Tue, 8 Mar 2016 15:51:28 +0100 Message-Id: <1457448699-9778-7-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1457448699-9778-1-git-send-email-tomeu.vizoso@collabora.com> References: <1457448699-9778-1-git-send-email-tomeu.vizoso@collabora.com> Cc: Daniel Stone , Tomeu Vizoso , Micah Fedke , Gustavo Padovan , Emil Velikov Subject: [Intel-gfx] [i-g-t PATCH v2 06/17] lib: Call intel_get_drm_devid only from intel code 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-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It only makes sense when testing the i915 driver, so don't call it otherwise. Signed-off-by: Tomeu Vizoso --- Changes in v2: None lib/igt_fb.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/igt_fb.c b/lib/igt_fb.c index 7b535560033d..f936961a484f 100644 --- a/lib/igt_fb.c +++ b/lib/igt_fb.c @@ -76,15 +76,14 @@ static struct format_desc_struct { static void igt_get_fb_tile_size(int fd, uint64_t tiling, int fb_bpp, unsigned *width_ret, unsigned *height_ret) { - uint32_t devid = intel_get_drm_devid(fd); - switch (tiling) { case LOCAL_DRM_FORMAT_MOD_NONE: *width_ret = 64; *height_ret = 1; break; case LOCAL_I915_FORMAT_MOD_X_TILED: - if (intel_gen(devid) == 2) { + if (is_i915_device(fd) && + intel_gen(intel_get_drm_devid(fd)) == 2) { *width_ret = 128; *height_ret = 16; } else { @@ -93,10 +92,11 @@ static void igt_get_fb_tile_size(int fd, uint64_t tiling, int fb_bpp, } break; case LOCAL_I915_FORMAT_MOD_Y_TILED: - if (intel_gen(devid) == 2) { + if (is_i915_device(fd) && + intel_gen(intel_get_drm_devid(fd)) == 2) { *width_ret = 128; *height_ret = 16; - } else if (IS_915(devid)) { + } else if (IS_915(intel_get_drm_devid(fd))) { *width_ret = 512; *height_ret = 8; } else {