From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7DDE51F8904; Tue, 3 Dec 2024 15:08:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733238500; cv=none; b=cb1TMI6/r0fpsLDd/Vo4Nh/4A48EcVOJcfqiHBUy/wXWoBGY7e6JnYPrB/L6rVlr4ZfSk6PyAmzw1zf+4osTb+XzCP+CkAsOnW4VofynqSHDB8P/dQFporkcBRitVsVth1Fpbn7C2qUb8UC/Lp8qDZrQ/WoC6cs6VdHgs108/t0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733238500; c=relaxed/simple; bh=lshpUcBAAcxrccWs8jPJD44VpBErDea/Bi9Ua+rS6qY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QS4WVoFnn4wPJialcubmN0GPtDZ4re0AYvzL+uHgA9vSEDFi5RbKUReOo8K60a8EahPPpFt5d8pxgRvyCJu0+zl8eE4/UyvL+D8pnh+yI8d/ZeoxzyERdiT4vd5+Z6xjs21aYpf3rHlFSNQZq5p/nFEJls8wFY7W/YoUxglcW/g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=UbzxzbeV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="UbzxzbeV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D9271C4CECF; Tue, 3 Dec 2024 15:08:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1733238497; bh=lshpUcBAAcxrccWs8jPJD44VpBErDea/Bi9Ua+rS6qY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UbzxzbeV/OmbNyacMRCs4x8GHpd8SZ9sn5uMiq3mp/0fSrYLNMMFn8mRZdMF/THxq AjEUKPrlVHK1jrY4hKSruba9M5vyDHZ5FdDhyaST/Iuq3GTuvdJrM/JHCtFYlkXEDL Oo+8AbkhzsjmfUu5AgONAf0rFc3W7khKqUJWQFi4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Lukasz Luba , Rob Clark , Sasha Levin Subject: [PATCH 6.11 297/817] drm/msm/gpu: Check the status of registration to PM QoS Date: Tue, 3 Dec 2024 15:37:49 +0100 Message-ID: <20241203144007.412348750@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241203143955.605130076@linuxfoundation.org> References: <20241203143955.605130076@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Lukasz Luba [ Upstream commit 8f32ddd87e499ba6d2dc74ce30b6932baf1e1fc3 ] There is a need to check the returned value of the registration function. In case of returned error, print that and stop the init process. Fixes: 7c0ffcd40b16 ("drm/msm/gpu: Respect PM QoS constraints") Signed-off-by: Lukasz Luba Patchwork: https://patchwork.freedesktop.org/patch/620336/ Signed-off-by: Rob Clark Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/msm_gpu_devfreq.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gpu_devfreq.c b/drivers/gpu/drm/msm/msm_gpu_devfreq.c index ea70c1c32d940..6970b0f7f457c 100644 --- a/drivers/gpu/drm/msm/msm_gpu_devfreq.c +++ b/drivers/gpu/drm/msm/msm_gpu_devfreq.c @@ -140,6 +140,7 @@ void msm_devfreq_init(struct msm_gpu *gpu) { struct msm_gpu_devfreq *df = &gpu->devfreq; struct msm_drm_private *priv = gpu->dev->dev_private; + int ret; /* We need target support to do devfreq */ if (!gpu->funcs->gpu_busy) @@ -156,8 +157,12 @@ void msm_devfreq_init(struct msm_gpu *gpu) mutex_init(&df->lock); - dev_pm_qos_add_request(&gpu->pdev->dev, &df->boost_freq, - DEV_PM_QOS_MIN_FREQUENCY, 0); + ret = dev_pm_qos_add_request(&gpu->pdev->dev, &df->boost_freq, + DEV_PM_QOS_MIN_FREQUENCY, 0); + if (ret < 0) { + DRM_DEV_ERROR(&gpu->pdev->dev, "Couldn't initialize QoS\n"); + return; + } msm_devfreq_profile.initial_freq = gpu->fast_rate; -- 2.43.0