Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8B03C3A5A9 for ; Sat, 2 May 2020 04:58:05 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id CA676208DB for ; Sat, 2 May 2020 04:58:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CA676208DB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E35DB6ED80; Sat, 2 May 2020 04:58:04 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2F5426ED7D for ; Sat, 2 May 2020 04:58:02 +0000 (UTC) IronPort-SDR: 3T6JtNVs39TaL0N1x5qUL3mKZvcYZz4B/1AjbYqfbUikYJUDk4qgHkUeN4kWiJ2d2WNJeiUQJh QLFo7r7uXEAw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 May 2020 21:58:01 -0700 IronPort-SDR: dG6APiWI8z+XJTyvIqGspsGaXlij8cuKQgPj3+KW/o1e62WBMd1Ya3SllcKl6Ho5CWMgCSqIE5 0BCW6b2svMww== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,342,1583222400"; d="scan'208";a="248710008" Received: from mdroper-desk1.fm.intel.com ([10.1.27.64]) by fmsmga007.fm.intel.com with ESMTP; 01 May 2020 21:58:01 -0700 From: Matt Roper To: intel-gfx@lists.freedesktop.org Date: Fri, 1 May 2020 21:57:44 -0700 Message-Id: <20200502045744.407060-4-matthew.d.roper@intel.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200502045744.407060-1-matthew.d.roper@intel.com> References: <20200502045744.407060-1-matthew.d.roper@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v2 3/3] drm/i915: Add MCR ranges for gen11 and gen12 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: chris@chris-wilson.co.uk Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" The multicast register ranges are slightly different for gen11 and gen12 than the table we have for gen8. This information never got updated in the bspec, so this patch is based on a spreadsheet provided by the hardware team while they work on getting the official documentation updated. Signed-off-by: Matt Roper --- drivers/gpu/drm/i915/gt/intel_workarounds.c | 45 ++++++++++++++++++--- 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c index b11b83546696..370607514e7b 100644 --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c @@ -1668,10 +1668,12 @@ create_scratch(struct i915_address_space *vm, int count) return ERR_PTR(err); } -static const struct { +struct mcr_range { u32 start; u32 end; -} mcr_ranges_gen8[] = { +}; + +static const struct mcr_range mcr_ranges_gen8[] = { { .start = 0x5500, .end = 0x55ff }, { .start = 0x7000, .end = 0x7fff }, { .start = 0x9400, .end = 0x97ff }, @@ -1680,11 +1682,42 @@ static const struct { {}, }; +static const struct mcr_range mcr_ranges_gen11[] = { + { .start = 0x5500, .end = 0x55ff }, + { .start = 0x7000, .end = 0x7fff }, + { .start = 0x8140, .end = 0x815f }, + { .start = 0x8c00, .end = 0x8cff }, + { .start = 0x94d0, .end = 0x955f }, + { .start = 0xb000, .end = 0xb3ff }, + { .start = 0xdf00, .end = 0xe8ff }, + { .start = 0x24400, .end = 0x24fff }, + {}, +}; + +static const struct mcr_range mcr_ranges_gen12[] = { + { .start = 0xb00, .end = 0xbff }, + { .start = 0x1000, .end = 0x1fff }, + { .start = 0x8150, .end = 0x815f }, + { .start = 0x8700, .end = 0x87ff }, + { .start = 0x9520, .end = 0x955f }, + { .start = 0xb100, .end = 0xb3ff }, + { .start = 0xde80, .end = 0xe8ff }, + { .start = 0x24a00, .end = 0x24a7f }, + {}, +}; + static bool mcr_range(struct drm_i915_private *i915, u32 offset) { + const struct mcr_range *range_list; int i; - if (INTEL_GEN(i915) < 8) + if (INTEL_GEN(i915) >= 12) + range_list = mcr_ranges_gen12; + else if (INTEL_GEN(i915) >= 11) + range_list = mcr_ranges_gen11; + else if (INTEL_GEN(i915) >= 8) + range_list = mcr_ranges_gen8; + else return false; /* @@ -1692,9 +1725,9 @@ static bool mcr_range(struct drm_i915_private *i915, u32 offset) * which only controls CPU initiated MMIO. Routing does not * work for CS access so we cannot verify them on this path. */ - for (i = 0; mcr_ranges_gen8[i].start; i++) - if (offset >= mcr_ranges_gen8[i].start && - offset <= mcr_ranges_gen8[i].end) + for (i = 0; range_list[i].start; i++) + if (offset >= range_list[i].start && + offset <= range_list[i].end) return true; return false; -- 2.24.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx