From patchwork Wed Mar 29 13:58:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9651617 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 B31D2602BE for ; Wed, 29 Mar 2017 13:58:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9FB2028485 for ; Wed, 29 Mar 2017 13:58:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9470B2849F; Wed, 29 Mar 2017 13:58:41 +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 5CBAF28485 for ; Wed, 29 Mar 2017 13:58:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E4C036E514; Wed, 29 Mar 2017 13:58:40 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wr0-x241.google.com (mail-wr0-x241.google.com [IPv6:2a00:1450:400c:c0c::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 380D16E514 for ; Wed, 29 Mar 2017 13:58:38 +0000 (UTC) Received: by mail-wr0-x241.google.com with SMTP id u18so3269230wrc.0 for ; Wed, 29 Mar 2017 06:58:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=ODgI9qoOESCRRovpYlHz8QloRzB4oRvfvtUrYSJMT80=; b=LIweoSzDbmqq+ehzBLR4anGqwkVgerDA20/CWpzp73F96XSnvPEuGlCUBKTW4YSJ7D XpfeLDSt0rE29zqpj6u3ta489LHYTxtJzeM8dcUqtmtk9ZGbTOyKz1M/g1Z8o5ZJWCMv meOy7i811OD4Zi5Y3N4Luplv2EhLbhRZwFQ1nmZHPaKlfYCNEzSwFW7hjwU7FaEgS+xp Hu3WTivyATel9HePUo8/qERxjBTgXQyiEnCFBf/HvcYZNAZ2x8jQFen3THhzh/zgpjsF Y2gG7eJ+fxnAbSE5quqcAdrw28q78uatq9Xc5pXb9dw7CACKavUEirRfiwAGxNgFPU39 Jjrg== 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 :in-reply-to:references; bh=ODgI9qoOESCRRovpYlHz8QloRzB4oRvfvtUrYSJMT80=; b=ZXnybVF+BgOGD8VTt3aT2OdttMMBNovYX6Fcy3pzEhwCe8hd13+ixJDD/4lDxf1WbL kHO6fzIGtlTdhUJXXgJV/ef9wbT2sZj5808YVcDeyP0qTv8UWsNj5bHQmOtNZzpU6C0q zfQUKtj2b3z0Ih1Fe3JA/VrLuDJA0u8HdZGqjLvjDkCjbG6MJc1dkirFxP7iEhuWEJxR b/bNd2FgrrSabPnqeQuiz93+n8k81A/U7vwX8K855FqJOA47+A9LSrN06ET9HJo8KaWF Akl6Rvop/f5OS3u6yKWr+qI0Z9a7+xesawFcSaDaJy11ZDBsa0fK/AY/rlpZWgCQmGZ7 GQ/g== X-Gm-Message-State: AFeK/H2CzJa7UNHu8NrV+/Zz99P5Avz7kGxYMr5FKHyNcdhH6ryud1JUShEO2oSWfwGbfg== X-Received: by 10.223.164.210 with SMTP id h18mr625708wrb.128.1490795916831; Wed, 29 Mar 2017 06:58:36 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id k32sm9508129wre.18.2017.03.29.06.58.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Mar 2017 06:58:36 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Wed, 29 Mar 2017 14:58:30 +0100 Message-Id: <20170329135831.30254-2-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170329135831.30254-1-chris@chris-wilson.co.uk> References: <20170329135831.30254-1-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [RFC 2/3] drm/i915: Add a routine to map from UABI id to engine 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 We have to mix a static UABI engine id with the potential for a varying hw_id and layout, and so we need a way to map from the userspace id for an engine to our internal pointers. Signed-off-by: Chris Wilson --- drivers/gpu/drm/i915/intel_engine_cs.c | 17 +++++++++++++++++ drivers/gpu/drm/i915/intel_ringbuffer.h | 3 +++ 2 files changed, 20 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c index 0f8b3312dad8..8a197f826d38 100644 --- a/drivers/gpu/drm/i915/intel_engine_cs.c +++ b/drivers/gpu/drm/i915/intel_engine_cs.c @@ -1125,6 +1125,23 @@ void intel_engines_cleanup(struct drm_i915_private *i915) engine->cleanup(engine); } +struct intel_engine_cs * +intel_engine_lookup(struct drm_i915_private *i915, u32 uabi_id) +{ + static const enum intel_engine_id uabi_map[] = { + [I915_EXEC_DEFAULT] = RCS, + [I915_EXEC_RENDER] = RCS, + [I915_EXEC_BLT] = BCS, + [I915_EXEC_BSD] = VCS, + [I915_EXEC_VEBOX] = VECS, + }; + + if (uabi_id >= ARRAY_SIZE(uabi_map)) + return NULL; + + return i915->engine[uabi_map[uabi_id]]; +} + #if IS_ENABLED(CONFIG_DRM_I915_SELFTEST) #include "selftests/mock_engine.c" #endif diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h index 53880389e6c9..7f8366da5a4c 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.h +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h @@ -671,6 +671,9 @@ static inline u32 *gen8_emit_pipe_control(u32 *batch, u32 flags, u32 offset) return batch + 6; } +struct intel_engine_cs * +intel_engine_lookup(struct drm_i915_private *i915, u32 uabi_id); + bool intel_engine_is_idle(struct intel_engine_cs *engine); bool intel_engines_are_idle(struct drm_i915_private *dev_priv);