Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2543078pxj; Mon, 10 May 2021 05:34:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJySiV1gLCKy6mOfwRzsWDWcEwC69S6ejnz/Zh8lOS8bhPi716iB57GIZWht6SCdceksG3pj X-Received: by 2002:a17:906:685:: with SMTP id u5mr25669817ejb.449.1620650048908; Mon, 10 May 2021 05:34:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620650048; cv=none; d=google.com; s=arc-20160816; b=BzmD/GbFMt/xd7v+xbnij/4L8dDpiqTxUVNTgQNXMYzRGev+keJqb6RNaQwoxxk0SD sZQGLNVu03dx+R4JWBhg2cmNTxUtXqiMw71Wwj2s0R5ar3PrvFvphaLv8F3zIKQbNtS6 ImNvh+sm84qWbG5wUT9uQjdU3qpGEgaU3IXpiQXVCOD6cW9ejjiSjG5B0glW1EWYVKrn 4Lrgvtvrzjdzxdp6aJprHQZ+kZxMCkb+Dp32Ki8U1IIVTCUndDqttkQ8awJ11gtY+JmM o7O9XtrLK4BZVieKvCrdt0rH3OiyzzSe1nef6uAt2yc7StWL2Ulzt5N3X4bw2FlX8o2Q /QYg== 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=7Dr/RmC36zUNp9jYMCscqBy0TFNXtQGmhkjRciZeUP8=; b=NevQShWFt4VkvvRxVd8kHR6MXtCqp5jpX5/7AKUKZFvUPzsunyXeTNe57ftdii2VGI qPKGwJg7y3R4oL31zVNlqsS0MZyg91RF9KiJxGOA4aop6y7mOCHTg4rHbK/KoIolg/fq 5Ke5r/fRid9iH3lpFMK4s8vZt7BJeLD5VBM/iTf+1D2/pFRLoVrle1pBpkDHosNdLvBd IjyAK/hA8I80J67vFmK+TKGlxOcpmTE1usn759qtDDF53pSR18wusXTWDv5OUDW7onWh gzY4xJyeg6JepZn/y805h9ngLXAMzqmOax5ntq6hk5EKzEYA+9hZ5wzRnYPAFqQLIanq GrDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=zc5SDvi4; 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 hq40si14020665ejc.161.2021.05.10.05.33.21; Mon, 10 May 2021 05:34:08 -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=zc5SDvi4; 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 S243912AbhEJMTp (ORCPT + 99 others); Mon, 10 May 2021 08:19:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:44344 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234752AbhEJLJG (ORCPT ); Mon, 10 May 2021 07:09:06 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B3D2861075; Mon, 10 May 2021 11:04:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620644695; bh=WtgBg4aqoSGF1AHZavDT1Gbq04vx8og/vxKkPVDIwTo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zc5SDvi4dW6yE1OvqH3ZyhhOx5IUiP89MRC8CWIiYhhgWf2E35T328db58WzKpFLL KOgpgr8m9/fTnrAJsCY+OG5JSS2RpwVgn5EVlR6XhX8HKU6yTMSPhFvObdbGZs+PiW PAl0ZiiVtLp6EqraRqwamu6q4URKnsjBJIBZdy1o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alex Sierra , Felix Kuehling , Alex Deucher , Sasha Levin Subject: [PATCH 5.12 185/384] drm/amdgpu: enable 48-bit IH timestamp counter Date: Mon, 10 May 2021 12:19:34 +0200 Message-Id: <20210510102020.990125855@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102014.849075526@linuxfoundation.org> References: <20210510102014.849075526@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: Alex Sierra [ Upstream commit 9a9c59a8f4f4478d5951eb0bded1d17b936aad6e ] By default this timestamp is 32 bit counter. It gets overflowed in around 10 minutes. Signed-off-by: Alex Sierra Reviewed-by: Felix Kuehling Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/vega20_ih.c b/drivers/gpu/drm/amd/amdgpu/vega20_ih.c index 75b06e1964ab..86dcf448e0c2 100644 --- a/drivers/gpu/drm/amd/amdgpu/vega20_ih.c +++ b/drivers/gpu/drm/amd/amdgpu/vega20_ih.c @@ -104,6 +104,8 @@ static int vega20_ih_toggle_ring_interrupts(struct amdgpu_device *adev, tmp = RREG32(ih_regs->ih_rb_cntl); tmp = REG_SET_FIELD(tmp, IH_RB_CNTL, RB_ENABLE, (enable ? 1 : 0)); + tmp = REG_SET_FIELD(tmp, IH_RB_CNTL, RB_GPU_TS_ENABLE, 1); + /* enable_intr field is only valid in ring0 */ if (ih == &adev->irq.ih) tmp = REG_SET_FIELD(tmp, IH_RB_CNTL, ENABLE_INTR, (enable ? 1 : 0)); -- 2.30.2