Patch "drm/i915/tc: Fix the ICL PHY ownership check in TC-cold state" has been added to the 6.2-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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

    drm/i915/tc: Fix the ICL PHY ownership check in TC-cold state

to the 6.2-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-i915-tc-fix-the-icl-phy-ownership-check-in-tc-co.patch
and it can be found in the queue-6.2 subdirectory.

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



commit 8e9f8636e40ce670f9f48b94689cd2497d449252
Author: Imre Deak <imre.deak@xxxxxxxxx>
Date:   Thu Mar 16 15:17:13 2023 +0200

    drm/i915/tc: Fix the ICL PHY ownership check in TC-cold state
    
    [ Upstream commit 38c583019484f190d5b33f59b8ae810e6b1763c6 ]
    
    The commit renaming icl_tc_phy_is_in_safe_mode() to
    icl_tc_phy_take_ownership() didn't flip the function's return value
    accordingly, fix this up.
    
    This didn't cause an actual problem besides state check errors, since
    the function is only used during HW readout.
    
    Cc: José Roberto de Souza <jose.souza@xxxxxxxxx>
    Fixes: f53979d68a77 ("drm/i915/display/tc: Rename safe_mode functions ownership")
    Reviewed-by: José Roberto de Souza <jose.souza@xxxxxxxxx>
    Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
    Signed-off-by: Imre Deak <imre.deak@xxxxxxxxx>
    Link: https://patchwork.freedesktop.org/patch/msgid/20230316131724.359612-4-imre.deak@xxxxxxxxx
    (cherry picked from commit f2c7959dda614d9b7c6a41510492de39d31705ec)
    Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c
index 70624b4b2d38c..c5d41fd51118f 100644
--- a/drivers/gpu/drm/i915/display/intel_tc.c
+++ b/drivers/gpu/drm/i915/display/intel_tc.c
@@ -436,9 +436,9 @@ static bool icl_tc_phy_is_owned(struct intel_digital_port *dig_port)
 				PORT_TX_DFLEXDPCSSS(dig_port->tc_phy_fia));
 	if (val == 0xffffffff) {
 		drm_dbg_kms(&i915->drm,
-			    "Port %s: PHY in TCCOLD, assume safe mode\n",
+			    "Port %s: PHY in TCCOLD, assume not owned\n",
 			    dig_port->tc_port_name);
-		return true;
+		return false;
 	}
 
 	return val & DP_PHY_MODE_STATUS_NOT_SAFE(dig_port->tc_phy_fia_idx);



[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux