From mboxrd@z Thu Jan 1 00:00:00 1970 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=-12.7 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 45028C43461 for ; Tue, 15 Sep 2020 23:57:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F014420720 for ; Tue, 15 Sep 2020 23:57:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600214231; bh=4bNBUO1gyYJHFqCnwdqdxfsZWK6wJzE3stm0C7itsEk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Iw8kvddF6SgzAFvL8rW1lNw4grxnzFdYdRK6AopnVvqB3wJ1i++klqo7IEqk/381D H9EdnHMC+wpEhKGZdeVhPBn4ZmHIWwdNQCGm256SfADH6z4a5P0fewXjPUSQM/WPof Ok5LQZzNAsKrRN2v6cmpSgFy4k9oJTltXARKSxtw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727351AbgIOX4x (ORCPT ); Tue, 15 Sep 2020 19:56:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:42986 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726335AbgIOOb3 (ORCPT ); Tue, 15 Sep 2020 10:31:29 -0400 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 8EFE422B3B; Tue, 15 Sep 2020 14:22:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600179756; bh=4bNBUO1gyYJHFqCnwdqdxfsZWK6wJzE3stm0C7itsEk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qaktFTRGF1wtunf4ZTJmnrW6gbo7qMjmwRhg2hUfcpFlbuYHJM30bDJkKdprzE95z y5pui34e+NtZ7dbxldS51fHZZ6PWfdipcGqE560FM3jMAD/FgVOVf9Q7w/VFlJDnDV M30MXWbkotSxfApRFFyi8COaa1L/o/+JvyEC+OIA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jordan Crouse , Rob Clark Subject: [PATCH 5.4 106/132] drm/msm: Disable preemption on all 5xx targets Date: Tue, 15 Sep 2020 16:13:28 +0200 Message-Id: <20200915140649.455152621@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200915140644.037604909@linuxfoundation.org> References: <20200915140644.037604909@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jordan Crouse commit 7b3f3948c8b7053d771acc9f79810cc410f5e2e0 upstream. Temporarily disable preemption on a5xx targets pending some improvements to protect the RPTR shadow from being corrupted. Cc: stable@vger.kernel.org Signed-off-by: Jordan Crouse Signed-off-by: Rob Clark Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c @@ -1451,7 +1451,8 @@ struct msm_gpu *a5xx_gpu_init(struct drm check_speed_bin(&pdev->dev); - ret = adreno_gpu_init(dev, pdev, adreno_gpu, &funcs, 4); + /* Restricting nr_rings to 1 to temporarily disable preemption */ + ret = adreno_gpu_init(dev, pdev, adreno_gpu, &funcs, 1); if (ret) { a5xx_destroy(&(a5xx_gpu->base.base)); return ERR_PTR(ret);