From patchwork Wed Apr 20 14:23:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Bragg X-Patchwork-Id: 8890321 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 585409F46D for ; Wed, 20 Apr 2016 14:24:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 667352025A for ; Wed, 20 Apr 2016 14:24:32 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 9BC4920108 for ; Wed, 20 Apr 2016 14:24:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2F8EF6EA0B; Wed, 20 Apr 2016 14:24:29 +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 23E316EA07; Wed, 20 Apr 2016 14:24:19 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id e201so11039617wme.2; Wed, 20 Apr 2016 07:24:19 -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=Gnekt8qbN76y5Zqmr9G03wmdoxKoRnqjQC8j01R/d+U=; b=nQWuwTz9APpSy4+KtGvbPLadO6qV+mzzupewvSYHCCTK+s9ibm1uJvMJVKcyQljcjz EH4Wv7mFBFrWjqDgwXRGJ/B1hxermFsIEmZ+N7k6Gmwiwpw3tZK1/0Z2wc+mSz9q/fXg Sq38xv2v4rn/Bvr9lLGqm9lUMLrg7GDWlh8JUeihBHEXGssbpuzta0yjvSh2sNJHXVHK 06PMAV/mX3f+MtpK2FRW0sIMOclQdD5YV+VBuMus3px2FpBxNlL6jTMODm3IhjtYmoXp UHmb4liKHN6phqFQxhph52Fpd1d1KaqyAzxZiYxwo9ZVjIq+zzMAsfiqvcCN+RLGMG1h 4CXg== 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=Gnekt8qbN76y5Zqmr9G03wmdoxKoRnqjQC8j01R/d+U=; b=iLYS7V4VQrEasnPfjGbgVpHsHWHRXf/VMOFgSoZFE6dGPR0XjgZtyfhgRGpDvy+9xy R93O6I3TYT796v2szOCkocDr91tcQwl69Hzlx+BVt2F2Q7zP8HTQwVDP4Y4rrJKWY/rd ql+jZvEpHXF6OvTwILDEZa6ST3NhNyhNwxXGE6FnHTA3SOZznEkr7kfi9l58v63fwSmI juf5+gfO4VbZZqqRkBWBVuPZrODQuq8b5Zid653m0ZpXoE0boKd14iA3DUMHvmDCA2ZU veXEmIKDtFl29jj6Z3GD30WQbT/Lg6ASCBbtJ/fE7Tk2m5UDJAvjqPXgzX63UUYFMpk6 hIVA== X-Gm-Message-State: AOPr4FXN6ZemgzvwfjvQoHjRwx457TvOnFMCJweEyMN63ky0Fl1IQOHyg2pmsGcujpMnLg== X-Received: by 10.28.173.137 with SMTP id w131mr29442395wme.72.1461162257544; Wed, 20 Apr 2016 07:24:17 -0700 (PDT) Received: from sixbynine.org (host-78-151-18-103.as13285.net. [78.151.18.103]) by smtp.gmail.com with ESMTPSA id wr2sm5861910wjc.49.2016.04.20.07.24.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Apr 2016 07:24:16 -0700 (PDT) From: Robert Bragg To: intel-gfx@lists.freedesktop.org Date: Wed, 20 Apr 2016 15:23:07 +0100 Message-Id: <1461162194-1424-3-git-send-email-robert@sixbynine.org> X-Mailer: git-send-email 2.7.1 In-Reply-To: <1461162194-1424-1-git-send-email-robert@sixbynine.org> References: <1461162194-1424-1-git-send-email-robert@sixbynine.org> Cc: David Airlie , dri-devel@lists.freedesktop.org, Sourab Gupta , Deepak S , Daniel Vetter Subject: [Intel-gfx] [PATCH 2/9] 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-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org 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 add 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 a337f33..035f2dd 100644 --- a/drivers/gpu/drm/i915/i915_cmd_parser.c +++ b/drivers/gpu/drm/i915/i915_cmd_parser.c @@ -445,7 +445,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), @@ -1092,7 +1092,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 9464ba3..de1e9a0 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -593,7 +593,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