From patchwork Wed Sep 14 14:19:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Bragg X-Patchwork-Id: 9331623 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 9574D6089F for ; Wed, 14 Sep 2016 14:20:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 86B2028B1B for ; Wed, 14 Sep 2016 14:20:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7B88D2A090; Wed, 14 Sep 2016 14:20:28 +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 B964729ECD for ; Wed, 14 Sep 2016 14:20:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AEEC66E743; Wed, 14 Sep 2016 14:20:16 +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 6B4086E744; Wed, 14 Sep 2016 14:20:14 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id g141so2810917wmd.1; Wed, 14 Sep 2016 07:20:14 -0700 (PDT) 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=4yeBFSyEspjvpGZmqUEj1A8KBhf8ZhBBVLtbGJ3NKfU=; b=zwKA246QreUTBKpNly9/ygxFv3TSlSCIQIgQOyilPDtgaHuzRN40mXPASY1A1LZi7s vFj5gTsp4+9SeMCsFL/RV6MTgan4wE3MLLuIyY0HxbcWLoIStg8v8o36pyvo5yeio5Id oqtqXp2M8N7NdrCdYsu3v02N5HyY1fnRUOZBkmYzGS1yEtQuvn4XsuC2IHfIcq9K1L1G 0+oioJkxR7exQ33nlKFcpYFEMy6CuyZM5WlfXUVjvzwfss13Ozlq2iecMwdsVLOBlSGm x3reiTCZi1mDeudbg+/ZSbOgvqSu4zxteDqnXCTC96L+/aNAvRfbCUb0criDu9witTGq 8Bfg== 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=4yeBFSyEspjvpGZmqUEj1A8KBhf8ZhBBVLtbGJ3NKfU=; b=D6DPTq+qcNdQERD8bTAXm9N+vExWZ3hKfJ+UWH0gl9wJ998ZnwJSnfkZNZt5HN5Bh4 pNkQeUgYe8U1oaXzYwQdxlygCuCSRan/sYTMYAAgYmz9t1bfmJ0ogdvUhHlN569wSXHj EOmF64T6AFl8eqHJ1u1otgrDYivvvJ7OvlZmjVHK/WZ03GB73Ghk9fHURdUo3pAWhEyd iSWcMx0/cO/1SBbJK77y8/I80NhlUW8siWdsJPboHxE74ktrinj8EINuUI/wEQbUCzKX ThepLqpc2xuChdbCvjND8SwOnIyQoIO0dsTORL7HflTnw7YquA4/PUw1QeaDVg01Y2Ik aUhQ== X-Gm-Message-State: AE9vXwM7tNE4TwWO4eaf0D5uw8bMJ3SjIIu/eMzsmt/F02U6+XqEM19nKqBNIBfCL3vW0A== X-Received: by 10.28.161.133 with SMTP id k127mr10302909wme.103.1473862812117; Wed, 14 Sep 2016 07:20:12 -0700 (PDT) Received: from sixbynine.org (host-78-151-16-234.as13285.net. [78.151.16.234]) by smtp.gmail.com with ESMTPSA id au10sm4465620wjc.12.2016.09.14.07.20.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2016 07:20:11 -0700 (PDT) From: Robert Bragg To: intel-gfx@lists.freedesktop.org Date: Wed, 14 Sep 2016 15:19:40 +0100 Message-Id: <20160914141949.27402-3-robert@sixbynine.org> X-Mailer: git-send-email 2.9.2 In-Reply-To: <20160914141949.27402-1-robert@sixbynine.org> References: <20160914141949.27402-1-robert@sixbynine.org> Cc: David Airlie , dri-devel@lists.freedesktop.org, Sourab Gupta , Daniel Vetter Subject: [Intel-gfx] [PATCH v5 02/11] drm/i915: rename OACONTROL GEN7_OACONTROL 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 OACONTROL changes quite a bit for gen8, with some bits split out into a per-context OACTXCONTROL register. Rename now before adding more gen7 OA registers Signed-off-by: Robert Bragg Reviewed-by: Matthew Auld --- drivers/gpu/drm/i915/i915_cmd_parser.c | 4 ++-- drivers/gpu/drm/i915/i915_reg.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_cmd_parser.c b/drivers/gpu/drm/i915/i915_cmd_parser.c index 3c72b3b..7269fe8 100644 --- a/drivers/gpu/drm/i915/i915_cmd_parser.c +++ b/drivers/gpu/drm/i915/i915_cmd_parser.c @@ -450,7 +450,7 @@ static const struct drm_i915_reg_descriptor gen7_render_regs[] = { REG64(PS_INVOCATION_COUNT), REG64(PS_DEPTH_COUNT), REG64_IDX(RING_TIMESTAMP, RENDER_RING_BASE), - REG32(OACONTROL), /* Only allowed for LRI and SRM. See below. */ + REG32(GEN7_OACONTROL), /* Only allowed for LRI and SRM. See below. */ REG64(MI_PREDICATE_SRC0), REG64(MI_PREDICATE_SRC1), REG32(GEN7_3DPRIM_END_OFFSET), @@ -1108,7 +1108,7 @@ static bool check_cmd(const struct intel_engine_cs *engine, * to the register. Hence, limit OACONTROL writes to * only MI_LOAD_REGISTER_IMM commands. */ - if (reg_addr == i915_mmio_reg_offset(OACONTROL)) { + if (reg_addr == i915_mmio_reg_offset(GEN7_OACONTROL)) { if (desc->cmd.value == MI_LOAD_REGISTER_MEM) { DRM_DEBUG_DRIVER("CMD: Rejected LRM to OACONTROL\n"); return false; diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index a29d707..90756b2 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -616,7 +616,7 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) #define HSW_CS_GPR(n) _MMIO(0x2600 + (n) * 8) #define HSW_CS_GPR_UDW(n) _MMIO(0x2600 + (n) * 8 + 4) -#define OACONTROL _MMIO(0x2360) +#define GEN7_OACONTROL _MMIO(0x2360) #define _GEN7_PIPEA_DE_LOAD_SL 0x70068 #define _GEN7_PIPEB_DE_LOAD_SL 0x71068