From patchwork Tue Nov 3 20:36:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 317171 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.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, 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 A803EC2D0A3 for ; Tue, 3 Nov 2020 20:50:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 73B2B22404 for ; Tue, 3 Nov 2020 20:50:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604436608; bh=NGI8kfOtgD+B03FqUS/r+/N6XslvOicZxXgEFEfwXSM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=vxM1oG9mXxCM5LCuX6RGB3y6+bPbCjo98x05Rnyeit2SNM31TpzENmXNnBjQIJGbE Z+Cpg3R4OGz0AcfUJ+qrP8LEDxF2MW2BcL4/QmRQZnLCo/4vxwQ6z7vRZff/jTYtWA kGqGxdpZ7WgQaMcGS/cyjJnqT8oioqAcy31BzsNM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731048AbgKCUuH (ORCPT ); Tue, 3 Nov 2020 15:50:07 -0500 Received: from mail.kernel.org ([198.145.29.99]:43800 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731748AbgKCUuD (ORCPT ); Tue, 3 Nov 2020 15:50:03 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CA4A820719; Tue, 3 Nov 2020 20:50:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604436603; bh=NGI8kfOtgD+B03FqUS/r+/N6XslvOicZxXgEFEfwXSM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dmPetGIGz/KmkerFxxHMrFQazTgGGWJhWov/WJYheTHCdBRhXh5bQmvIXT4szfg+H Wmupd+hWu2+SeolOYMNgB1KJShCs/DKcwk6tLLa/bCTnJon14uGugWj6hsexzK+SCz 7yLTrGT3IUznKnnSJ/EoZwRSmOGcAYJKg5INk3OA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jay Cornwall , Felix Kuehling , Alex Deucher Subject: [PATCH 5.9 322/391] drm/amdkfd: Use same SQ prefetch setting as amdgpu Date: Tue, 3 Nov 2020 21:36:13 +0100 Message-Id: <20201103203408.838591094@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203348.153465465@linuxfoundation.org> References: <20201103203348.153465465@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jay Cornwall commit d56b1980d7efe9ef08469e856fc0703d0cef65e4 upstream. 0 causes instruction fetch stall at cache line boundary under some conditions on Navi10. A non-zero prefetch is the preferred default in any case. Fixes soft hang in Luxmark. Signed-off-by: Jay Cornwall Reviewed-by: Felix Kuehling Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v10.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v10.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v10.c @@ -58,8 +58,9 @@ static int update_qpd_v10(struct device_ /* check if sh_mem_config register already configured */ if (qpd->sh_mem_config == 0) { qpd->sh_mem_config = - SH_MEM_ALIGNMENT_MODE_UNALIGNED << - SH_MEM_CONFIG__ALIGNMENT_MODE__SHIFT; + (SH_MEM_ALIGNMENT_MODE_UNALIGNED << + SH_MEM_CONFIG__ALIGNMENT_MODE__SHIFT) | + (3 << SH_MEM_CONFIG__INITIAL_INST_PREFETCH__SHIFT); #if 0 /* TODO: * This shouldn't be an issue with Navi10. Verify.