Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp302433pxj; Thu, 20 May 2021 09:39:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx0ZSk9Ipu9I+3PUFy31fB57gakArbF0srdNWjGRSfq1wqglnLo8QH9Ul5sFKhyKLVAhm3l X-Received: by 2002:aa7:ce0b:: with SMTP id d11mr6001448edv.283.1621528750462; Thu, 20 May 2021 09:39:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621528750; cv=none; d=google.com; s=arc-20160816; b=vJjY1yofsuPuJPea2uIu9MzTbwVFWJFBHSqIRrarJ5tvwIzgWD+J6q8m8EXutJaoYS n/kkVIFbqS5NUIJFtJttYa02+o59Ekq2MBFQY08Rgkb9RpRoBGbXFVFyi5NDUGIGVg2G UtZRd9ZjVNFajSDDqatEJEMyIVDDFBzVoEx19HitTCYQ0qKG3JGFA9PMJmEPEsUqH5Gp ySpNSk2+W5zw/Dn7yeWtA4iGEcLGlgGirIbi84A87v7Nl21xxf3YYE4MLEx3Acf0gVtn Txe7QE/34V0XqP5kPkJxaPy3mn0jI7RuR63N9U3MHxWxt4q9BDSf1Ki/xVaGKqEQFUG2 lSSg== 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=8RijBd66ZIK5fW1y457xCgK1wWR1n//Tj19wX8+mdoo=; b=ar24p9RrLli5+xB+Paw0zWjzZtcPq6hniHrXS0ddGlDRqF1HTzOlZbd6Ijf+yPqylJ 1nh+/mf1oeZXiwYuvrJotu5a3xJIXThILoq4Gx47mpOZ357Wbl0MshlBJT/dfcl2CM3M OsXHXKVUNUgez7adqpIIlllAkKxK7LoxI33bdHId4DIwyiO7YIMW0kps4lnRK5lp39mS CM6huVHv7AeW6EV+Gado0yKNEat6Xwn9X1eCUIldndXnXEb167DYKjptaa2w2DN3TXYP vdwNHGJYf35BT9DOpKv5/ptVAUsPSogdVTl2fTus0OaoPa3X5LlEQsNjL3MbbJJ/C5Dw 7c4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=vU3tJ05e; 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 x2si3369505ejy.213.2021.05.20.09.38.46; Thu, 20 May 2021 09:39:10 -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=vU3tJ05e; 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 S232773AbhETJlC (ORCPT + 99 others); Thu, 20 May 2021 05:41:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:41904 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233311AbhETJjP (ORCPT ); Thu, 20 May 2021 05:39:15 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2EE4961421; Thu, 20 May 2021 09:31:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621503064; bh=DMPfJLhMJ1dY0RoG7NKxrjmH+LGy7NrejNLEePArhVk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vU3tJ05e3fA6TMCWM86a1EMYF0g3VFmOG0dS2ItkkpCc1iAFwbXhjfY8QILQx/xN5 D0WeH9rJquFgHym75DuQoIIuvPnEiA2cdleRmu62vGG2qWemuNnomYoewH7v3RlVVQ nwEHa8++h77E8BmZgVXDV4lZv8L7mjrvBEz/OJVs= 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 4.19 052/425] drm/amdgpu : Fix asic reset regression issue introduce by 8f211fe8ac7c4f Date: Thu, 20 May 2021 11:17:01 +0200 Message-Id: <20210520092133.145144528@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092131.308959589@linuxfoundation.org> References: <20210520092131.308959589@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 1abf5b5bac9e..18402a6ba8fe 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c @@ -447,7 +447,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