Patch "drm/xe/hwmon: Fix PL1 disable flow in xe_hwmon_power_max_write" has been added to the 6.10-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

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

    drm/xe/hwmon: Fix PL1 disable flow in xe_hwmon_power_max_write

to the 6.10-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-xe-hwmon-fix-pl1-disable-flow-in-xe_hwmon_power_.patch
and it can be found in the queue-6.10 subdirectory.

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



commit 66fa6ff76e5dd86b1b7152f51c7dd535c36867e7
Author: Karthik Poosa <karthik.poosa@xxxxxxxxx>
Date:   Thu Aug 1 16:54:24 2024 +0530

    drm/xe/hwmon: Fix PL1 disable flow in xe_hwmon_power_max_write
    
    [ Upstream commit ac3191c5cf47e2d5220a1ed7353a2e498a1f415e ]
    
    In xe_hwmon_power_max_write, for PL1 disable supported case, instead of
    returning after PL1 disable, PL1 enable path was also being run.
    Fixed it by returning after disable.
    
    v2: Correct typo and grammar in commit message. (Jonathan)
    
    Signed-off-by: Karthik Poosa <karthik.poosa@xxxxxxxxx>
    Fixes: fef6dd12b45a ("drm/xe/hwmon: Protect hwmon rw attributes with hwmon_lock")
    Reviewed-by: Jonathan Cavitt <jonathan.cavitt@xxxxxxxxx>
    Signed-off-by: Matt Roper <matthew.d.roper@xxxxxxxxx>
    Link: https://patchwork.freedesktop.org/patch/msgid/20240801112424.1841766-1-karthik.poosa@xxxxxxxxx
    (cherry picked from commit 146458645e505f5eac498759bcd865cf7c0dfd9a)
    Signed-off-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/gpu/drm/xe/xe_hwmon.c b/drivers/gpu/drm/xe/xe_hwmon.c
index 453e601ddd5e6..d37f1dea9f8b8 100644
--- a/drivers/gpu/drm/xe/xe_hwmon.c
+++ b/drivers/gpu/drm/xe/xe_hwmon.c
@@ -200,9 +200,10 @@ static int xe_hwmon_power_max_write(struct xe_hwmon *hwmon, int channel, long va
 				     PKG_PWR_LIM_1_EN, 0, channel);
 
 		if (reg_val & PKG_PWR_LIM_1_EN) {
+			drm_warn(&gt_to_xe(hwmon->gt)->drm, "PL1 disable is not supported!\n");
 			ret = -EOPNOTSUPP;
-			goto unlock;
 		}
+		goto unlock;
 	}
 
 	/* Computation in 64-bits to avoid overflow. Round to nearest. */