Received: by 2002:a25:23cc:0:0:0:0:0 with SMTP id j195csp787510ybj; Thu, 7 May 2020 07:39:16 -0700 (PDT) X-Google-Smtp-Source: APiQypLpzF+aRznT1oAIvWpubbDETZ2D7fa3t9LeqZzRI6URCvXwyD061vZx5Y2WaGIIf78y9ge+ X-Received: by 2002:a05:6402:1fb:: with SMTP id i27mr2264615edy.37.1588862356095; Thu, 07 May 2020 07:39:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588862356; cv=none; d=google.com; s=arc-20160816; b=t8xjZo1LQ6+r7LmHcTjqQnsSjcF2pYavNf5DSAT2c99ag4kWG3dLTdMaBOq+BKBpsP h98L9tCuFOyS1qLYm45OA0cddvd/Xhxu4VDJtLWw2u5JeS4y5GueMCiJZhKyQzRqqoGs +nw+8CDSdPyoDn/DuRK01ye5yM5A/5o2RPfw1e5qXZqUyMkzp+366Y/Zh4rY5Mq57LcY xVv4k8Ct2ej6/ShSOr/sNlkLRnkJfRO7vRJFgtRqDtxE0/Le/Lk5T5VAUgllqb/gGmEq RloZmy5t6ilGDgmX3AzjFVABk4rNt7jbQw7jbuwbfbcai991GdUxUQQ06UIBGfkvaIYB L9Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=NOEFy6unv67ekqfE8wr4d/tIFcSk7ru3AQNpeYGMfZU=; b=dyfFafhTIGUc7tlB8uzm0gRnymxJbhsNyreE5UXTs67OADOGAu8qBFtmoLLvqoNfw3 yW2nokOD7HkgGLD+MRFKsOvkDgW55XMF8GBQGZNSCUm6006elcfUPws1Ys3JXd+ElMX5 Md93lG/AlrogTXiY0VmeF8OBDvd1wu1AyT8XycOaSm8kVQRirW+2xSpJcMkg2ze2Ds6Q f9Wdy6Cae9hYN/e1SDba2z/I+1Ev2fSW5HRobVEq1S/WOZGNvrs/tfM+PBsbGxH4ED5/ XRqYW9U+Jp5uDvIdtjHN8AZqH2yRg7uu7sMDxbjqRmvYxLuuZ+Y67g0N+2x2wNJYvb16 qW2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=fTrEG8zG; 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=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r12si3389821edm.95.2020.05.07.07.38.52; Thu, 07 May 2020 07:39:16 -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=@kernel.org header.s=default header.b=fTrEG8zG; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728117AbgEGOg4 (ORCPT + 99 others); Thu, 7 May 2020 10:36:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:54380 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727970AbgEGO2I (ORCPT ); Thu, 7 May 2020 10:28:08 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3A7E62084D; Thu, 7 May 2020 14:28:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588861688; bh=0zUgoL8zGPgVJ5XXJhZqITkeX4BLPqERLZPMDtUiQog=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fTrEG8zGrix8TC/GUvQe0Grxu2JXjdVGsxa/A6WOOMTojb2l07ZTRDzZdR4WI0Ut7 I2gNK+UjUsjQXiR+fs8RtNjEgIdC+TyxV27XzXLs0OrINq6DcGgznGhkm8qhUKPlFM Wp4wVHR8bbq2bnInJcg8fSfyfbKbBXoy0QXK/p4M= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= , =?UTF-8?q?Christian=20K=C3=B6nig?= , Pierre-Eric Pelloux-Prayer , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.6 33/50] drm/amdgpu: bump version for invalidate L2 before SDMA IBs Date: Thu, 7 May 2020 10:27:09 -0400 Message-Id: <20200507142726.25751-33-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200507142726.25751-1-sashal@kernel.org> References: <20200507142726.25751-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Marek Olšák [ Upstream commit 9017a4897a20658f010bebea825262963c10afa6 ] This fixes GPU hangs due to cache coherency issues. Bump the driver version. Split out from the original patch. Signed-off-by: Marek Olšák Reviewed-by: Christian König Tested-by: Pierre-Eric Pelloux-Prayer Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index 42f4febe24c6d..8d45a2b662aeb 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -85,9 +85,10 @@ * - 3.34.0 - Non-DC can flip correctly between buffers with different pitches * - 3.35.0 - Add drm_amdgpu_info_device::tcc_disabled_mask * - 3.36.0 - Allow reading more status registers on si/cik + * - 3.37.0 - L2 is invalidated before SDMA IBs, needed for correctness */ #define KMS_DRIVER_MAJOR 3 -#define KMS_DRIVER_MINOR 36 +#define KMS_DRIVER_MINOR 37 #define KMS_DRIVER_PATCHLEVEL 0 int amdgpu_vram_limit = 0; -- 2.20.1