Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp3767580pxt; Tue, 10 Aug 2021 10:51:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx10w3oYSmfHVieUbMDzd+rzxWREOZuoooi6FZIsk2XAQqWlv8WYWk9PueySEr5d+kV1Oj+ X-Received: by 2002:a05:6e02:1bcb:: with SMTP id x11mr90191ilv.168.1628617884702; Tue, 10 Aug 2021 10:51:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628617884; cv=none; d=google.com; s=arc-20160816; b=wUup6MrZiTa+vV9PMQZBTPDr+jISqwa6qVaA1tY3uAySI2EQ8PkN1b2NdGLkm7Qi4w mAIH89bQiV1xBc2e2vXeKUrJabs4BaklBQLYpFROM4ZDLF7E0gfv6Mkc0xgT0EfTRxsz PYvGzZiF0kD/sc796CgJIN3+HIYDQ/E/pJ1KZ2280M0lmzKxExq+PMoOSajdZrUT8FQc UESomUhymS6OTfAuYY49PldVeCgRw3pdczKiFisBirDekh/3HKkE2wd5VJtRfBe1KUbt 1eQlwrSeNzxGHhS6IUonH9ZgwMQQvQkjrUh6rZCJy9Hg1QI5QTQZ3HZSrUmofJp8E2Js Qrug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=cGn0PKxSwycG/4JL10B26PvzXAND+niq+MjntHlZYfg=; b=W1D+QPXVpCuu4WllA1PUSdr0GklngwkzMAb7ZP/Xb448jKf8JKiJ7ObtZA7FdzOITI 7wzgrK8nkvyDX6WzZKxHaHdJ0zC4CKz/vjCXh6MOnvOvzta0wrdAsFjxl/PUd77QmnNp h0NvBiQPe55oTLaF5YWs2Bsd4j4rWzZmeNnQtU0P/QUog7V7d13jk9cwkTytDemKWLWc zmuECz8PPHbh2Tl6hDwg2pXQswHCDMJEdLK23YmoxyR0wAfdq9gcA9gYK7+gRHmq7Bc/ 7wvyXgKkVUXvpiIMUhlibhRKJGWZxKcLGicA+aRJ5jbZi6G3fR0vL7KRVV4ITwpkpuiy uh3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=NCVFbZsC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g9si13549044ila.119.2021.08.10.10.51.13; Tue, 10 Aug 2021 10:51:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=NCVFbZsC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234052AbhHJRur (ORCPT + 99 others); Tue, 10 Aug 2021 13:50:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:50910 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235258AbhHJRr5 (ORCPT ); Tue, 10 Aug 2021 13:47:57 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 88E1961075; Tue, 10 Aug 2021 17:41:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1628617270; bh=fQOstmbRlspXSogWLL7VNXQJHjnMFUIAHB4Xgmwa3yQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NCVFbZsCnYGyvy/aZITicyGNIYPh7ZdXJsDqicvGMsR67S/PG2a+nvsFd3ezJRsue bGZ1KmRlfitrbMj7k2rCddSAnXfDjYVxHQ/S+QuuEqyNqV4t1Pp0Eott7SmRPd18cE 0vltOOkZP5SQ6jWrkwVXhQt+BRCHh/KGB9zDDqrM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mika Kuoppala , Matt Roper , Rodrigo Vivi Subject: [PATCH 5.10 121/135] drm/i915: Correct SFC_DONE register offset Date: Tue, 10 Aug 2021 19:30:55 +0200 Message-Id: <20210810172959.904639631@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810172955.660225700@linuxfoundation.org> References: <20210810172955.660225700@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Matt Roper commit 9c9c6d0ab08acfe41c9f7efa72c4ad3f133a266b upstream. The register offset for SFC_DONE was missing a '0' at the end, causing us to read from a non-existent register address. We only use this register in error state dumps so the mistake hasn't caused any real problems, but fixing it will hopefully make the error state dumps a bit more useful for debugging. Fixes: e50dbdbfd9fb ("drm/i915/tgl: Add SFC instdone to error state") Cc: Mika Kuoppala Signed-off-by: Matt Roper Link: https://patchwork.freedesktop.org/patch/msgid/20210728233411.2365788-1-matthew.d.roper@intel.com Reviewed-by: Mika Kuoppala (cherry picked from commit 82929a2140eb99f1f1d21855f3f580e70d7abdd8) Signed-off-by: Rodrigo Vivi Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/i915/i915_reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -413,7 +413,7 @@ static inline bool i915_mmio_reg_valid(i #define GEN11_VECS_SFC_USAGE(engine) _MMIO((engine)->mmio_base + 0x2014) #define GEN11_VECS_SFC_USAGE_BIT (1 << 0) -#define GEN12_SFC_DONE(n) _MMIO(0x1cc00 + (n) * 0x100) +#define GEN12_SFC_DONE(n) _MMIO(0x1cc000 + (n) * 0x1000) #define GEN12_SFC_DONE_MAX 4 #define RING_PP_DIR_BASE(base) _MMIO((base) + 0x228)