Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 11B84C25B50 for ; Mon, 23 Jan 2023 19:01:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 63A9B10E1F4; Mon, 23 Jan 2023 19:01:02 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9B11F10E1F4 for ; Mon, 23 Jan 2023 19:01:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674500461; x=1706036461; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=8ATHmTu5rnakjLMZgpHBCQ0i+NGfn36EI4re5ghYFnI=; b=mJpP8PNGba4JjF8UcZTZO5ROf/L00KhussLVbV3ouN1Yotge6Avnv3Nv yUXMKHNIDlO0XI4bTiroHVH150dau23j3Jpx1nC5xrxqvsN1OKgEQFoe4 IMLbO9agW9hE+HZUQVnVqXEvezMdGsQRZeE8oZKz5gXVmCOtqA7sQQ5Cd D6aalDYu0Kj5I2Gyqk/rRdDOUHkedgDFbWkkcYAbhNQ4wFJlMIiCpJhEq zBmRFk9XZfLQP2Oy1limPVa61tKYWDGfdnBBLc8Qx5rTaFrpyyZQz7Kks IO/qKsBJXHKQ0Cpw3BDXYUA47f1fu89Y4njeEsj2WJ3SdhO7r0aIPJSUr Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10599"; a="323813970" X-IronPort-AV: E=Sophos;i="5.97,240,1669104000"; d="scan'208";a="323813970" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jan 2023 11:01:01 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10599"; a="770010934" X-IronPort-AV: E=Sophos;i="5.97,240,1669104000"; d="scan'208";a="770010934" Received: from dut-internal-9dd7.jf.intel.com ([10.24.14.53]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jan 2023 11:01:00 -0800 From: Jonathan Cavitt To: intel-gfx@lists.freedesktop.org Date: Mon, 23 Jan 2023 10:56:29 -0800 Message-Id: <20230123185629.1593320-1-jonathan.cavitt@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Intel-gfx] [PATCH] drm/i915: Use uabi engines for the default engine map 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: jonathan.cavitt@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: Tvrtko Ursulin Default engine map is exactly about uabi engines so no excuse not to use the appropriate iterator to populate it. Signed-off-by: Tvrtko Ursulin Signed-off-by: Jonathan Cavitt Reveiwed-by: Jonathan Cavitt --- drivers/gpu/drm/i915/gem/i915_gem_context.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c index 454e73a433c8..42a39e103d7c 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c @@ -1096,16 +1096,15 @@ static struct i915_gem_engines *alloc_engines(unsigned int count) static struct i915_gem_engines *default_engines(struct i915_gem_context *ctx, struct intel_sseu rcs_sseu) { - const struct intel_gt *gt = to_gt(ctx->i915); + const unsigned int max = I915_NUM_ENGINES; struct intel_engine_cs *engine; struct i915_gem_engines *e, *err; - enum intel_engine_id id; - e = alloc_engines(I915_NUM_ENGINES); + e = alloc_engines(max); if (!e) return ERR_PTR(-ENOMEM); - for_each_engine(engine, gt, id) { + for_each_uabi_engine(engine, ctx->i915) { struct intel_context *ce; struct intel_sseu sseu = {}; int ret; @@ -1113,7 +1112,7 @@ static struct i915_gem_engines *default_engines(struct i915_gem_context *ctx, if (engine->legacy_idx == INVALID_ENGINE) continue; - GEM_BUG_ON(engine->legacy_idx >= I915_NUM_ENGINES); + GEM_BUG_ON(engine->legacy_idx >= max); GEM_BUG_ON(e->engines[engine->legacy_idx]); ce = intel_context_create(engine); -- 2.25.1