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=-8.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 9CAA9C2D0DB for ; Thu, 23 Jan 2020 19:16:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7410D2077C for ; Thu, 23 Jan 2020 19:16:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="fTwlNQnS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729049AbgAWTQj (ORCPT ); Thu, 23 Jan 2020 14:16:39 -0500 Received: from mail-pg1-f196.google.com ([209.85.215.196]:43053 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727590AbgAWTQj (ORCPT ); Thu, 23 Jan 2020 14:16:39 -0500 Received: by mail-pg1-f196.google.com with SMTP id u131so1840644pgc.10 for ; Thu, 23 Jan 2020 11:16:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=6wtdQZE06z+aORJTnpPZKoEwjECFJKRvpZenOyG2pbs=; b=fTwlNQnSmBYcTlW2X4DkUAm58zuHxoeu1OEc1vVlBWKcW7LfEspLDnJ4HX4efyba1l uObRu4eaRbt9SL8oC69dLx0ZzK8f0kGqGgDXBigb4khY/TnOqcOfpmpj0x3bKD/JteV6 Jwk1lWXngMbf/5avCtsxAskWpmpWiUPoVg32g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=6wtdQZE06z+aORJTnpPZKoEwjECFJKRvpZenOyG2pbs=; b=Beax+fDrrmh+J43Um4pRSJkoTNVSXReN0udDdg4N2VKHxdJ3gZCAFnCP3+oZYL4Wg4 xs3Fz5dWuEemL9/2ExuYfUqxwuHhVO3S2sHUjw/Kdh4jI24U+G3HFCQiqTyhv5MyGwSG X3krP6gekduSy1prgv/3GhV9uvJHcqHQzeHvPfExpHaJLSm2qKZMpdeeWP8UZFvHM3Et nO0wqt48RmvvnuTsWj1vm1a27p+4iyipvO5u2Y5rdf9nvRjxaqHMwyy0GpxIK7hMJs6k 3UfucsehVlxifLl/JxnhtyspgKflZAK9kawkWjuIINxNL3EK9Lkd1Z+6KmpfTJuQyhba kjgg== X-Gm-Message-State: APjAAAXsRAc6YNro1TA/EBFrossVQpbDSwHLC3vwQRYZE9TAyz/+yEbP yLutOS9BkYC1Zp0ohSsHGelMkw== X-Google-Smtp-Source: APXvYqw0a9ZjVf1aQi0SykCpNbX3nRr/2knF42uGFzUQInRewtmQbXeOhyiUEjTVPoGuKU6GqXuSJg== X-Received: by 2002:a65:4d0b:: with SMTP id i11mr336402pgt.340.1579806998644; Thu, 23 Jan 2020 11:16:38 -0800 (PST) Received: from localhost ([2620:15c:202:1:4fff:7a6b:a335:8fde]) by smtp.gmail.com with ESMTPSA id w8sm3323441pfn.186.2020.01.23.11.16.37 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 23 Jan 2020 11:16:38 -0800 (PST) Date: Thu, 23 Jan 2020 11:16:36 -0800 From: Matthias Kaehlcke To: Jordan Crouse Cc: linux-arm-msm@vger.kernel.org, Sean Paul , Sharat Masetty , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Douglas Anderson , Rob Clark , David Airlie , Georgi Djakov , freedreno@lists.freedesktop.org, Daniel Vetter Subject: Re: [PATCH] drm/msm: Fix a6xx GMU shutdown sequence Message-ID: <20200123191636.GY89495@google.com> References: <1579797756-10292-1-git-send-email-jcrouse@codeaurora.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1579797756-10292-1-git-send-email-jcrouse@codeaurora.org> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Jordan, On Thu, Jan 23, 2020 at 09:42:36AM -0700, Jordan Crouse wrote: > Commit e812744c5f95 ("drm: msm: a6xx: Add support for A618") missed > updating the VBIF flush in a6xx_gmu_shutdown and instead > inserted the new sequence into a6xx_pm_suspend along with a redundant > GMU idle. > > Move a6xx_bus_clear_pending_transactions to a6xx_gmu.c and use it in > the appropriate place in the shutdown routine and remove the redundant > idle call. > > Signed-off-by: Jordan Crouse > --- > > drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 36 +++++++++++++++++++++++++---- > drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 43 ----------------------------------- > 2 files changed, 31 insertions(+), 48 deletions(-) > > diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c > index 983afea..f371227 100644 > --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c > +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c > > ... > > /* Gracefully try to shut down the GMU and by extension the GPU */ > static void a6xx_gmu_shutdown(struct a6xx_gmu *gmu) > { > @@ -819,11 +849,7 @@ static void a6xx_gmu_shutdown(struct a6xx_gmu *gmu) > return; > } > > - /* Clear the VBIF pipe before shutting down */ > - gpu_write(gpu, REG_A6XX_VBIF_XIN_HALT_CTRL0, 0xf); > - spin_until((gpu_read(gpu, REG_A6XX_VBIF_XIN_HALT_CTRL1) & 0xf) > - == 0xf); > - gpu_write(gpu, REG_A6XX_VBIF_XIN_HALT_CTRL0, 0); > + a6xx_bus_clear_pending_transactions(adreno_gpu); With this the variable 'gpu' isn't used anymore in a6xx_gmu_shutdown(), please remove it.