Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2464903pxj; Mon, 10 May 2021 03:44:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyMcFY7bXlVyreUU8B7pLmq/3A4U7CRwqoZy5O2R5iVJ49hf8i6Tub0rMtbOeGOpGHXxtEQ X-Received: by 2002:a92:d688:: with SMTP id p8mr20541476iln.268.1620643495323; Mon, 10 May 2021 03:44:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620643495; cv=none; d=google.com; s=arc-20160816; b=qtx4R3f0zgkAZbkINrWLNgLK3azZAwWnpI9FuUDMt3T/9yue0KrJ9a7rIBSjBj4BzA RirZgxF45/far0zF9f7OYppEnkeSRyWiAz8W8zfYp+ka3xXyFzP8pvWPHlQinSWI/e09 pUcvvExGio+U7eR7ZUHAPOhgyJyNwTK4WRLuzbE+eSmBYauKu8+TJ3seOWS8pmO7JATz jXjHUUE8/5m4099I/aEKQvK0JNO/jB0z469vO7my6rl8iyfWq2cxVa1NBjtoGRKy0MaQ DxJrGoTejs4YfMRhrh95rj0mQdZmNF902W3EReoRWz4ADX+a4U8SRjULAliBQk1+JlM/ rbaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=yJ31u0bcMU3Bq1TIsDgMoW4/vpBLCsmQnt8T/KtEJUY=; b=YkYptaDjXQyniGo7lKNWL+70PRmiV5+vXeaKt9ae9WoCXG+9G3uCOHSf+CuSGpi3Ac dpQQg3hhbDqpyrwB0zpaW4qyc7RcxfmL5R7atKqlTaCdWPY0mGxlozcK9OJw2O963/+6 eMg4///5kIlJIoMZtmmY0ALL9nnyowZC1Q9YLUkM5BlP0qER0efbF9mWcAnMmEg1WDFO VvzomQXKqCfHBbVR+LTUBi/Q2pFOSzcXoVGfM2bvLcz9aQTGaeWmMU1XCYipXReCAZtw l0mWJKY13bu4OY6SQnWh1Yt2fSeuTA2kcQYBscNo2LUOotXhKItJmnKY7w0413JfJ4Zi qcrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=XkQAn3Of; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z8si17274002ilq.2.2021.05.10.03.44.41; Mon, 10 May 2021 03:44:55 -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=@linuxfoundation.org header.s=korg header.b=XkQAn3Of; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230235AbhEJKnn (ORCPT + 99 others); Mon, 10 May 2021 06:43:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:44026 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232859AbhEJKfT (ORCPT ); Mon, 10 May 2021 06:35:19 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1DC40613C2; Mon, 10 May 2021 10:28:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620642511; bh=XY5Q3F7k4aS58IjutYJQkeCihrbXMHpVgZ7yIBOo/oY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XkQAn3OfbtJgQtl12nU8zddZiyfXxpamR8Oe38NfTH1g9oBiU2LEfyOe2uDysdEDQ ZoKlNDWDwn4orTcvjU6aJGpsQRIt4LQVRgEDooAZxPaGW/TFhNiAucSqT/RPqlmI1q YqVo7fvBqUmWjbmaf8Th/gSlX8YIx/ep8uwW6iZM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, shaoyunl , Hawking Zhang , Alex Deucher , Sasha Levin Subject: [PATCH 5.4 089/184] drm/amdgpu : Fix asic reset regression issue introduce by 8f211fe8ac7c4f Date: Mon, 10 May 2021 12:19:43 +0200 Message-Id: <20210510101953.091829837@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510101950.200777181@linuxfoundation.org> References: <20210510101950.200777181@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: shaoyunl [ Upstream commit c8941550aa66b2a90f4b32c45d59e8571e33336e ] This recent change introduce SDMA interrupt info printing with irq->process function. These functions do not require a set function to enable/disable the irq Signed-off-by: shaoyunl Reviewed-by: Hawking Zhang Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c index 2a3f5ec298db..76429932035e 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c @@ -469,7 +469,7 @@ void amdgpu_irq_gpu_reset_resume_helper(struct amdgpu_device *adev) for (j = 0; j < AMDGPU_MAX_IRQ_SRC_ID; ++j) { struct amdgpu_irq_src *src = adev->irq.client[i].sources[j]; - if (!src) + if (!src || !src->funcs || !src->funcs->set) continue; for (k = 0; k < src->num_types; k++) amdgpu_irq_update(adev, src, k); -- 2.30.2