Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2449451pxj; Mon, 31 May 2021 02:26:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy19KxUgg/GpssnLkIs+UYa3RpLE5ThXbNtzfTHAsPnKWU6+9fsoZeISMCwR2S0x0oJ8nvk X-Received: by 2002:a05:6638:134c:: with SMTP id u12mr19932550jad.67.1622453184665; Mon, 31 May 2021 02:26:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622453184; cv=none; d=google.com; s=arc-20160816; b=0n6yIJTzB3IMf0S/FdeGZ8F4hrSQb6UfZT6ihnav/oDoyi3TaJMtPja2RHPFusa3HE MzZdVE3/5H1spN63GFtZosPlIQB2nHfw+cavpf+APg3Bw3bnqlSjP+xzwpKjhh9HrtBe 6K8MN44KWZ8jZml5e0w3KNA0l9OZbanV2b8umqLfMyagGExxjkFiIxuMQpeA5WSAK+B4 ZflZdCk5PPTgCgaa0irz8ahzhTDCeg1blY3KnUtCtUpJPyOXvHneum8rHJOl3+RhAMsZ WG+5QPlYZdWtZSuHbVTWKTULdpQavf9oyQZaTMSB8j3ElHbELBFnxWzk56Zgfc9qrk8l KPOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-language :in-reply-to:mime-version:user-agent:date:message-id:from:references :cc:to:subject:dmarc-filter:sender:dkim-signature; bh=rfrUNiJtJb8dbghF/3gQm7fw8uC4HOEDbtXTJPnqFZ4=; b=MWKsMZbqEAXYFSnwVWn/HCGd26VkLfy8TAJf88k9EuCZMQs4RXVgjBQpEfuSU1aDA2 BO9pL1K+WE/beUfeLlotxoFvR3/GmV5/WU01kaAlzEp1SZMRyxtXNft6wc5kZSdXdBhJ hDpHGIzNS3uJH+Ebtm9PXlSRRegNF3GLwIcCAH6XzLub82zSeGvRk/SoDh6dK1PdFARD w0rXScGi3VmWDPUOGw1y2iwt6MmMkcsn/l0juRWh5xFavgi/6PPbQJfEl46MVrydOWr1 RDrDX6AsstnXY6xSLm9Abg9Ln4O30i4uFyYf5fUXa7tNW1dQDghctBOCrWXHC5S/gpnE cDbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mg.codeaurora.org header.s=smtp header.b="I/9JClED"; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g15si833572ilk.32.2021.05.31.02.26.11; Mon, 31 May 2021 02:26:24 -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=@mg.codeaurora.org header.s=smtp header.b="I/9JClED"; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230518AbhEaJ1W (ORCPT + 99 others); Mon, 31 May 2021 05:27:22 -0400 Received: from m43-7.mailgun.net ([69.72.43.7]:18970 "EHLO m43-7.mailgun.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230479AbhEaJ1V (ORCPT ); Mon, 31 May 2021 05:27:21 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1622453142; h=Content-Transfer-Encoding: Content-Type: In-Reply-To: MIME-Version: Date: Message-ID: From: References: Cc: To: Subject: Sender; bh=rfrUNiJtJb8dbghF/3gQm7fw8uC4HOEDbtXTJPnqFZ4=; b=I/9JClEDIH6AAXzInSfkBwpGIo5m7YeGqGm3jbAyFPoyWWbaq5D2TO6P0gi5+fqAbnnULbmy gULvgaU5kvmwzoggFBxEOFGS/PvFFrlEnDN6C8NayJZi6NUgCrCVJozGjNByyZ+1KuzXYxXp opGzgO1QxPPjtIuyxn/3vd0qOIY= X-Mailgun-Sending-Ip: 69.72.43.7 X-Mailgun-Sid: WyI0MWYwYSIsICJsaW51eC1rZXJuZWxAdmdlci5rZXJuZWwub3JnIiwgImJlOWU0YSJd Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n07.prod.us-east-1.postgun.com with SMTP id 60b4ab945e7926f57b6a9b58 (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Mon, 31 May 2021 09:25:40 GMT Sender: akhilpo=codeaurora.org@mg.codeaurora.org Received: by smtp.codeaurora.org (Postfix, from userid 1001) id A3086C43217; Mon, 31 May 2021 09:25:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-caf-mail-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.5 required=2.0 tests=ALL_TRUSTED,BAYES_00, NICE_REPLY_A,SPF_FAIL,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from [192.168.1.105] (unknown [117.210.184.158]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: akhilpo) by smtp.codeaurora.org (Postfix) with ESMTPSA id 55813C433D3; Mon, 31 May 2021 09:25:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 55813C433D3 Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=fail smtp.mailfrom=akhilpo@codeaurora.org Subject: Re: [PATCH v2 5/8] drm/msm/a6xx: avoid shadow NULL reference in failure path To: Jonathan Marek , freedreno@lists.freedesktop.org Cc: Rob Clark , Sean Paul , David Airlie , Daniel Vetter , Jordan Crouse , Sai Prakash Ranjan , Eric Anholt , Sharat Masetty , Douglas Anderson , "open list:DRM DRIVER FOR MSM ADRENO GPU" , "open list:DRM DRIVER FOR MSM ADRENO GPU" , open list References: <20210513171431.18632-1-jonathan@marek.ca> <20210513171431.18632-6-jonathan@marek.ca> From: Akhil P Oommen Message-ID: <3695f4d0-aa6f-4c85-bf4e-c3b59506ec34@codeaurora.org> Date: Mon, 31 May 2021 14:55:31 +0530 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.10.2 MIME-Version: 1.0 In-Reply-To: <20210513171431.18632-6-jonathan@marek.ca> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 5/13/2021 10:44 PM, Jonathan Marek wrote: > If a6xx_hw_init() fails before creating the shadow_bo, the a6xx_pm_suspend > code referencing it will crash. Change the condition to one that avoids > this problem (note: creation of shadow_bo is behind this same condition) > > Fixes: e8b0b994c3a5 ("drm/msm/a6xx: Clear shadow on suspend") > Signed-off-by: Jonathan Marek > --- > drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c > index 909e3ff08f89..ff3c328604f8 100644 > --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c > +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c > @@ -1284,7 +1284,7 @@ static int a6xx_pm_suspend(struct msm_gpu *gpu) > if (ret) > return ret; > > - if (adreno_gpu->base.hw_apriv || a6xx_gpu->has_whereami) > + if (a6xx_gpu->shadow_bo) > for (i = 0; i < gpu->nr_rings; i++) > a6xx_gpu->shadow[i] = 0; > > Reviewed-by: Akhil P Oommen -Akhil