Patch "drm/panthor: Preserve the result returned by panthor_fw_resume()" has been added to the 6.13-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    drm/panthor: Preserve the result returned by panthor_fw_resume()

to the 6.13-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     drm-panthor-preserve-the-result-returned-by-panthor_.patch
and it can be found in the queue-6.13 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit aa72c958613402bbc4f6a6fb414086988ced3bfc
Author: Boris Brezillon <boris.brezillon@xxxxxxxxxxxxx>
Date:   Wed Dec 11 08:54:15 2024 +0100

    drm/panthor: Preserve the result returned by panthor_fw_resume()
    
    [ Upstream commit 4bd56ca8226dda6115bca385b166ef87e867d807 ]
    
    WARN() will return true if the condition is true, false otherwise.
    If we store the return of drm_WARN_ON() in ret, we lose the actual
    error code.
    
    v3:
    - Add R-b
    v2:
    - Add R-b
    
    Fixes: 5fe909cae118 ("drm/panthor: Add the device logical block")
    Signed-off-by: Boris Brezillon <boris.brezillon@xxxxxxxxxxxxx>
    Reviewed-by: Steven Price <steven.price@xxxxxxx>
    Reviewed-by: Adrian Larumbe <adrian.larumbe@xxxxxxxxxxxxx>
    Link: https://patchwork.freedesktop.org/patch/msgid/20241211075419.2333731-2-boris.brezillon@xxxxxxxxxxxxx
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/gpu/drm/panthor/panthor_device.c b/drivers/gpu/drm/panthor/panthor_device.c
index 6fbff516c1c1f..01dff89bed4e1 100644
--- a/drivers/gpu/drm/panthor/panthor_device.c
+++ b/drivers/gpu/drm/panthor/panthor_device.c
@@ -445,8 +445,8 @@ int panthor_device_resume(struct device *dev)
 	    drm_dev_enter(&ptdev->base, &cookie)) {
 		panthor_gpu_resume(ptdev);
 		panthor_mmu_resume(ptdev);
-		ret = drm_WARN_ON(&ptdev->base, panthor_fw_resume(ptdev));
-		if (!ret) {
+		ret = panthor_fw_resume(ptdev);
+		if (!drm_WARN_ON(&ptdev->base, ret)) {
 			panthor_sched_resume(ptdev);
 		} else {
 			panthor_mmu_suspend(ptdev);