From patchwork Tue Sep 15 14:13:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 309691 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 81FB4C43461 for ; Tue, 15 Sep 2020 23:19:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 44A81206F4 for ; Tue, 15 Sep 2020 23:19:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600211987; bh=nXF2EjRsDyXF2BVeXg6+pPHvvV1eApRGioivUuOmVSc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ppc9V4jXUB9VRZtbYEO5Ojj0RpZUU0VL3yoAkShAJUOVCaIUVR/VzxQCyLZ510VMd v1k06o5qKBF4+IwIRe0wvPpMnNTTZhbqdtCkjTbnZHkEzvThVNquSFHSfsYEbN2xPd v2A/3Ybtvil5UJ/gQtM13NEnBE2yvb/oxxe7cI8U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727277AbgIOXTp (ORCPT ); Tue, 15 Sep 2020 19:19:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:48798 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727236AbgIOOj2 (ORCPT ); Tue, 15 Sep 2020 10:39:28 -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 0E2D122581; Tue, 15 Sep 2020 14:29:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600180192; bh=nXF2EjRsDyXF2BVeXg6+pPHvvV1eApRGioivUuOmVSc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t6bnTtht+sRzxEdaOZq+31AidUlw5lI46L4H5YEAh9dV14zSU6WnijvQGjBKRZrCP 7AO33OThOFoaEqrVNSJEzTJzKt8gBZ6SckGk7Qh8hxQn6aur+LtgsY8B0LB5SuI7SF p9sgvWIyOyc+grnxjY5YWomPk+eklnrWaKsxOXnE= 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.8 144/177] drm/msm: Disable preemption on all 5xx targets Date: Tue, 15 Sep 2020 16:13:35 +0200 Message-Id: <20200915140700.560603331@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200915140653.610388773@linuxfoundation.org> References: <20200915140653.610388773@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 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 @@ -1510,7 +1510,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);