From patchwork Mon Aug 15 14:41:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Bragg X-Patchwork-Id: 9281141 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 3E1CD6086A for ; Mon, 15 Aug 2016 14:41:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 303AF28CF7 for ; Mon, 15 Aug 2016 14:41:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2545628D0E; Mon, 15 Aug 2016 14:41: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=unavailable 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 E84DE28D06 for ; Mon, 15 Aug 2016 14:41:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DDF846E557; Mon, 15 Aug 2016 14:41:39 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id DA5036E551; Mon, 15 Aug 2016 14:41:36 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id i5so11477485wmg.2; Mon, 15 Aug 2016 07:41:36 -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=GLemJDTmMxkHjlg5C8s7WN/92Tob/FLM84FeTzlm+zQ=; b=ORz2ZMQgOgW/eXQXMwlpQtVhcdO1dlMBSjbQ1VBen8tSZIjviZA8sG6NiaAT3zFzir zqy1xZqasGM6qMLji0mIp5lRAN3C3WcNzhNax7psMAi67H7cO+AD93wTnTShH+z5Ivdp vBVBL2fXpmLOVxnlEBMIOCg9cC85hnefuKOypwGNFEgV/V7P1bee2X+FZnDik8uNWULv SQB2lhoAV7iPpjkV2jhMcjFxGPVJ3my/uiHGwo9aDx4QMhFQoUoxszDdnRAXUBARRuXU RqvcwPpi+3sSGmxGE++OT9+40N+DBXqHC2UvJ0T1Xd3cUbHqcUbJUDNNNhnzBVfhWXsz AaOQ== 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=GLemJDTmMxkHjlg5C8s7WN/92Tob/FLM84FeTzlm+zQ=; b=Aq12tBmE/XyBqj0hZILIX5Dl9gepQj65voFFXScunAv3RKfkGbaIQIzetsqw2U43jA Ed4WxIN2LsMhcW+sThI20sc7GZEaLzA3fquBGtnTdORBXixDzby2Vg3IeH7b8+ajPrTQ rckUdWvRU7qs4nbHeGYqetOdvLrf1P98izhGK0VblRx2B+nPH7diBMJVI6tM4RRgn7Kq 2y1N9L30cqqnWu/kCCkw2MOkGbcf6P8ym84owtVWzejf0rt+uTkXBEZPqlS3YVY28UZq b2YwVCU+Vh/HcX41ih4ePpbkCNCA9h86B9bHByX+eapax93LXfCLWcUNf5ia88OHW2io O2hA== X-Gm-Message-State: AEkooutFW8lCHVZDssPcgU4H7PnVvrnfgQHZnjpy+p027KzzUTn9l0SkPFbpohD0lmlVXg== X-Received: by 10.194.87.66 with SMTP id v2mr36084117wjz.40.1471272095534; Mon, 15 Aug 2016 07:41:35 -0700 (PDT) Received: from sixbynine.org ([192.198.151.62]) by smtp.gmail.com with ESMTPSA id d8sm16930660wmi.0.2016.08.15.07.41.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Aug 2016 07:41:34 -0700 (PDT) From: Robert Bragg To: intel-gfx@lists.freedesktop.org Subject: [PATCH v3 02/11] drm/i915: rename OACONTROL GEN7_OACONTROL Date: Mon, 15 Aug 2016 15:41:19 +0100 Message-Id: <20160815144128.7847-3-robert@sixbynine.org> X-Mailer: git-send-email 2.9.2 In-Reply-To: <20160815144128.7847-1-robert@sixbynine.org> References: <20160815144128.7847-1-robert@sixbynine.org> Cc: dri-devel@lists.freedesktop.org, Sourab Gupta , Daniel Vetter , Robert Bragg X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 --- 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 1db829c..cfe3e7a 100644 --- a/drivers/gpu/drm/i915/i915_cmd_parser.c +++ b/drivers/gpu/drm/i915/i915_cmd_parser.c @@ -446,7 +446,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), @@ -1097,7 +1097,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 9397dde..ba91eff 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