[PATCH 0/2] Fix for lightup issue on Lenovo 4k60 HDMI

[PATCH 0/2] Fix for lightup issue on Lenovo 4k60 HDMI

[Fangzhi Zuo]

338567d176 ("drm/amd/display: Fix MST BW calculation Regression") has been merged
with a mistake being fixed by "drm/amd/display: Fix a mistake in revert commit"
 
Fix dsc enablement for Synaptics Cascaded Panamera hub is included in
"drm/amd/display: Fix Synaptics Cascaded DSC Determination"

Please apply the two patches on
https://gitlab.freedesktop.org/agd5f/linux/-/commits/amd-staging-drm-next,
and give a sanity test on 4k60 over Lenovo HDMI output.

Fangzhi Zuo (2):
  drm/amd/display: Fix a mistake in revert commit
  drm/amd/display: Fix Synaptics Cascaded DSC Determination

 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.34.1

[PATCH 1/2] drm/amd/display: Fix a mistake in revert commit

[Fangzhi Zuo]

[why]
It is to fix in try_disable_dsc() due to misrevert patch of
"drm/amd/display: Fix MST BW calculation Regression"

[How]
Fix restoring minimum compression bw by 'max_kbps', instead of
native bw 'stream_kbps'

Signed-off-by: Fangzhi Zuo <Jerry.Zuo@amd.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
index 958fad0d5307..5e08ca700c3f 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@ -1066,7 +1066,7 @@ static int try_disable_dsc(struct drm_atomic_state *state,
 			vars[next_index].dsc_enabled = false;
 			vars[next_index].bpp_x16 = 0;
 		} else {
-			vars[next_index].pbn = kbps_to_peak_pbn(params[next_index].bw_range.stream_kbps, fec_overhead_multiplier_x1000);
+			vars[next_index].pbn = kbps_to_peak_pbn(params[next_index].bw_range.max_kbps, fec_overhead_multiplier_x1000);
 			ret = drm_dp_atomic_find_time_slots(state,
 							    params[next_index].port->mgr,
 							    params[next_index].port,
-- 
2.34.1

[PATCH 2/2] drm/amd/display: Fix Synaptics Cascaded DSC Determination

[Fangzhi Zuo]

Synaptics Cascaded Panamera topology needs to unconditionally
acquire root aux for dsc decoding.

Signed-off-by: Fangzhi Zuo <Jerry.Zuo@amd.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
index 5e08ca700c3f..b77ecf3fb60c 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@ -252,7 +252,7 @@ static bool validate_dsc_caps_on_connector(struct amdgpu_dm_connector *aconnecto
 		aconnector->dsc_aux = &aconnector->mst_root->dm_dp_aux.aux;
 
 	/* synaptics cascaded MST hub case */
-	if (!aconnector->dsc_aux && is_synaptics_cascaded_panamera(aconnector->dc_link, port))
+	if (is_synaptics_cascaded_panamera(aconnector->dc_link, port))
 		aconnector->dsc_aux = port->mgr->aux;
 
 	if (!aconnector->dsc_aux)
-- 
2.34.1

Re: [PATCH 0/2] Fix for lightup issue on Lenovo 4k60 HDMI

[Jiri Slaby]

On 22. 08. 24, 21:14, Fangzhi Zuo wrote:
> 338567d176 ("drm/amd/display: Fix MST BW calculation Regression") has been merged
> with a mistake being fixed by "drm/amd/display: Fix a mistake in revert commit"
>   
> Fix dsc enablement for Synaptics Cascaded Panamera hub is included in
> "drm/amd/display: Fix Synaptics Cascaded DSC Determination"
> 
> Please apply the two patches on
> https://gitlab.freedesktop.org/agd5f/linux/-/commits/amd-staging-drm-next,
> and give a sanity test on 4k60 over Lenovo HDMI output.

For both of them:
Tested-by: Jiri Slaby <jirislaby@kernel.org>

thanks,
-- 
js
suse labs

Re: [PATCH 0/2] Fix for lightup issue on Lenovo 4k60 HDMI

[Aurabindo Pillai]

On 8/22/24 3:14 PM, Fangzhi Zuo wrote:
> 338567d176 ("drm/amd/display: Fix MST BW calculation Regression") has been merged
> with a mistake being fixed by "drm/amd/display: Fix a mistake in revert commit"
>   
> Fix dsc enablement for Synaptics Cascaded Panamera hub is included in
> "drm/amd/display: Fix Synaptics Cascaded DSC Determination"
> 
> Please apply the two patches on
> https://gitlab.freedesktop.org/agd5f/linux/-/commits/amd-staging-drm-next,
> and give a sanity test on 4k60 over Lenovo HDMI output.
> 
> Fangzhi Zuo (2):
>    drm/amd/display: Fix a mistake in revert commit
>    drm/amd/display: Fix Synaptics Cascaded DSC Determination
> 
>   drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 

Reviewed-by: Aurabindo Pillai <aurabindo.pillai@amd.com>

--

Thanks & Regards,
Aurabindo Pillai