From patchwork Wed Jan 22 15:23:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 11345909 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D23FC6C1 for ; Wed, 22 Jan 2020 15:23:59 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BAABB2071E for ; Wed, 22 Jan 2020 15:23:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BAABB2071E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 828C56F586; Wed, 22 Jan 2020 15:23:58 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9901A6F583; Wed, 22 Jan 2020 15:23:54 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Jan 2020 07:23:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,350,1574150400"; d="scan'208";a="427437177" Received: from wmszyfel-mobl2.ger.corp.intel.com (HELO localhost.localdomain) ([10.252.10.247]) by fmsmga006.fm.intel.com with ESMTP; 22 Jan 2020 07:23:53 -0800 From: Tvrtko Ursulin To: igt-dev@lists.freedesktop.org Date: Wed, 22 Jan 2020 15:23:49 +0000 Message-Id: <20200122152349.12154-2-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200122152349.12154-1-tvrtko.ursulin@linux.intel.com> References: <20200122152349.12154-1-tvrtko.ursulin@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH i-g-t 2/2] i915/gem_engine_topology: Fix virtual engine check X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Intel-gfx@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: Tvrtko Ursulin Engine class/instance have to be u16 for the virtual engine check to work. Signed-off-by: Tvrtko Ursulin Reported-by: Chris Wilson Reviewed-by: Chris Wilson --- lib/i915/gem_engine_topology.c | 2 +- lib/igt_gt.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/i915/gem_engine_topology.c b/lib/i915/gem_engine_topology.c index c3645eab8538..989a6e26d6ef 100644 --- a/lib/i915/gem_engine_topology.c +++ b/lib/i915/gem_engine_topology.c @@ -105,7 +105,7 @@ static const char *class_names[] = { }; static void init_engine(struct intel_execution_engine2 *e2, - int class, int instance, uint64_t flags) + uint16_t class, uint16_t instance, uint64_t flags) { int ret; diff --git a/lib/igt_gt.h b/lib/igt_gt.h index 6a8eceb68817..e880cd4ed11f 100644 --- a/lib/igt_gt.h +++ b/lib/igt_gt.h @@ -96,8 +96,8 @@ bool gem_class_can_store_dword(int fd, int class); extern const struct intel_execution_engine2 { char name[16]; - int class; - int instance; + uint16_t class; + uint16_t instance; uint64_t flags; bool is_virtual; } intel_execution_engines2[];