<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style>
</head>
<body dir="ltr">
<p style="font-family:Arial;font-size:10pt;color:#0000FF;margin:5pt;font-style:normal;font-weight:normal;text-decoration:none;" align="Left">
[AMD Official Use Only - General]<br>
</p>
<br>
<div>
<div><span style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">Does
</span><span style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 11pt; color: rgb(0, 0, 0);">amdgpu_dm_connector_funcs_reset</span><span style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);" class="elementToProof">()
get called on wakeup from suspend ? Users would want the system to have the same brightness level before suspending.<br>
</span></div>
<div class="elementToProof" style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
<br>
</div>
<div class="elementToProof" style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
<br>
</div>
<div id="Signature">
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
--</div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
<br>
</div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
Regards,</div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
Jay<br>
</div>
</div>
<div id="appendonsend"></div>
<hr style="display:inline-block;width:98%" tabindex="-1">
<div id="divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" style="font-size:11pt" color="#000000"><b>From:</b> Mahfooz, Hamza <Hamza.Mahfooz@amd.com><br>
<b>Sent:</b> Wednesday, November 22, 2023 5:24 PM<br>
<b>To:</b> amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org><br>
<b>Cc:</b> Wentland, Harry <Harry.Wentland@amd.com>; Li, Sun peng (Leo) <Sunpeng.Li@amd.com>; Siqueira, Rodrigo <Rodrigo.Siqueira@amd.com>; Koenig, Christian <Christian.Koenig@amd.com>; Hung, Alex <Alex.Hung@amd.com>; Pillai, Aurabindo <Aurabindo.Pillai@amd.com>;
Wu, Hersen <hersenxs.wu@amd.com>; Lin, Wayne <Wayne.Lin@amd.com>; Mahfooz, Hamza <Hamza.Mahfooz@amd.com><br>
<b>Subject:</b> [PATCH] drm/amd/display: fix ABM disablement</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">On recent versions of DMUB firmware, if we want to completely disable<br>
ABM we have to pass ABM_LEVEL_IMMEDIATE_DISABLE as the requested ABM<br>
level to DMUB. Otherwise, LCD eDP displays are unable to reach their<br>
maximum brightness levels. So, to fix this whenever the user requests an<br>
ABM level of 0 pass ABM_LEVEL_IMMEDIATE_DISABLE to DMUB instead. Also,<br>
to keep the user's experience consistent map ABM_LEVEL_IMMEDIATE_DISABLE<br>
to 0 when a user tries to read the requested ABM level.<br>
<br>
Signed-off-by: Hamza Mahfooz <hamza.mahfooz@amd.com><br>
---<br>
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 +++++---<br>
1 file changed, 5 insertions(+), 3 deletions(-)<br>
<br>
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c<br>
index 5d9496db0ecb..8cb92d941cd9 100644<br>
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c<br>
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c<br>
@@ -6230,7 +6230,7 @@ int amdgpu_dm_connector_atomic_set_property(struct drm_connector *connector,<br>
dm_new_state->underscan_enable = val;<br>
ret = 0;<br>
} else if (property == adev->mode_info.abm_level_property) {<br>
- dm_new_state->abm_level = val;<br>
+ dm_new_state->abm_level = val ?: ABM_LEVEL_IMMEDIATE_DISABLE;<br>
ret = 0;<br>
}<br>
<br>
@@ -6275,7 +6275,8 @@ int amdgpu_dm_connector_atomic_get_property(struct drm_connector *connector,<br>
*val = dm_state->underscan_enable;<br>
ret = 0;<br>
} else if (property == adev->mode_info.abm_level_property) {<br>
- *val = dm_state->abm_level;<br>
+ *val = (dm_state->abm_level != ABM_LEVEL_IMMEDIATE_DISABLE) ?<br>
+ dm_state->abm_level : 0;<br>
ret = 0;<br>
}<br>
<br>
@@ -6348,7 +6349,8 @@ void amdgpu_dm_connector_funcs_reset(struct drm_connector *connector)<br>
state->pbn = 0;<br>
<br>
if (connector->connector_type == DRM_MODE_CONNECTOR_eDP)<br>
- state->abm_level = amdgpu_dm_abm_level;<br>
+ state->abm_level = amdgpu_dm_abm_level ?:<br>
+ ABM_LEVEL_IMMEDIATE_DISABLE;<br>
<br>
__drm_atomic_helper_connector_reset(connector, &state->base);<br>
}<br>
-- <br>
2.42.1<br>
<br>
</div>
</span></font></div>
</div>
</body>
</html>