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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 CB686C38A2A for ; Fri, 8 May 2020 12:54:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9EFF724963 for ; Fri, 8 May 2020 12:54:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588942469; bh=VXaTF5Sg9/q9wYJFlFmu6w+iIcc5llX/YscAoycyeq4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JD/8eZWk4DmiNJMbUedBhOMDYBulcjSTzGYpEgofa+Ln3+YFBcx6S2nwEfaYVxw9J IUJjnpVZpJkCH18VYRT8UD12vEKuZZMt0UqiuSbMnVDNzBRPF/mUafy2ugVBJ5p9v8 9vvZJ/VlsH+q8USJXXTBV71R8SxEt3SaPkLhT1Qc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730212AbgEHMy0 (ORCPT ); Fri, 8 May 2020 08:54:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:36674 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729807AbgEHMyX (ORCPT ); Fri, 8 May 2020 08:54:23 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 E244E2495A; Fri, 8 May 2020 12:54:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588942463; bh=VXaTF5Sg9/q9wYJFlFmu6w+iIcc5llX/YscAoycyeq4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iuYAIL2TOwyWHamncgrXQ8EmX4AzeO9GV9uSTIcPxXsroUPMzE6gjD4xfSifkqiLc bv639dcUUTmzGiOmrqFf8OC7G9OajZD6d+r904jm4AmONOMsTrNfSgJ5nTSW9kAGAH zwtDymG0JSeQWN/O4t86/VCKPkqE3vmBKnie104M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Aaron Ma , Alex Deucher Subject: [PATCH 5.4 32/50] drm/amdgpu: Fix oops when pp_funcs is unset in ACPI event Date: Fri, 8 May 2020 14:35:38 +0200 Message-Id: <20200508123047.913100748@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200508123043.085296641@linuxfoundation.org> References: <20200508123043.085296641@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Aaron Ma commit 5932d260a8d85a103bd6c504fbb85ff58b156bf9 upstream. On ARCTURUS and RENOIR, powerplay is not supported yet. When plug in or unplug power jack, ACPI event will issue. Then kernel NULL pointer BUG will be triggered. Check for NULL pointers before calling. Signed-off-by: Aaron Ma Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c @@ -90,7 +90,8 @@ void amdgpu_pm_acpi_event_handler(struct adev->pm.ac_power = true; else adev->pm.ac_power = false; - if (adev->powerplay.pp_funcs->enable_bapm) + if (adev->powerplay.pp_funcs && + adev->powerplay.pp_funcs->enable_bapm) amdgpu_dpm_enable_bapm(adev, adev->pm.ac_power); mutex_unlock(&adev->pm.mutex); }