Commit c35b6ea8 authored by Mario Limonciello's avatar Mario Limonciello Committed by Alex Deucher
Browse files

drm/amd/display: Set minimum requirement for using PSR-SU on Rembrandt 

A number of parade TCONs are causing system hangs when utilized with
older DMUB firmware and PSR-SU. Some changes have been introduced into
DMUB firmware to add resilience against these failures.

Don't allow running PSR-SU unless on the newer firmware.

Cc: stable@vger.kernel.org
Cc: Sean Wang <sean.ns.wang@amd.com>
Cc: Marc Rossi <Marc.Rossi@amd.com>
Cc: Hamza Mahfooz <Hamza.Mahfooz@amd.com>
Cc: Tsung-hua (Ryan) Lin <Tsung-hua.Lin@amd.com>
Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2443


Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Reviewed-by: default avatarLeo Li <sunpeng.li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 274d205c

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c

+2 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
 */



#include "amdgpu_dm_psr.h"

#include "dc_dmub_srv.h"

#include "dc.h"

#include "dm_helpers.h"

#include "amdgpu_dm.h"
@@ -50,7 +51,7 @@ static bool link_supports_psrsu(struct dc_link *link) 
	    !link->dpcd_caps.psr_info.psr2_su_y_granularity_cap)

		return false;



	return true;

	return dc_dmub_check_min_version(dc->ctx->dmub_srv->dmub);

}



/*

drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c

+7 −0
Original line number Diff line number Diff line
@@ -1011,3 +1011,10 @@ void dc_send_update_cursor_info_to_dmu( 
		dm_execute_dmub_cmd_list(pCtx->stream->ctx, 2, cmd, DM_DMUB_WAIT_TYPE_WAIT);

	}

}



bool dc_dmub_check_min_version(struct dmub_srv *srv)

{

	if (!srv->hw_funcs.is_psrsu_supported)

		return true;

	return srv->hw_funcs.is_psrsu_supported(srv);

}

drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h

+1 −0
Original line number Diff line number Diff line
@@ -86,4 +86,5 @@ void dc_dmub_setup_subvp_dmub_command(struct dc *dc, struct dc_state *context, b 
void dc_dmub_srv_log_diagnostic_data(struct dc_dmub_srv *dc_dmub_srv);



void dc_send_update_cursor_info_to_dmu(struct pipe_ctx *pCtx, uint8_t pipe_idx);

bool dc_dmub_check_min_version(struct dmub_srv *srv);

#endif /* _DMUB_DC_SRV_H_ */

drivers/gpu/drm/amd/display/dmub/dmub_srv.h

+2 −0
Original line number Diff line number Diff line
@@ -367,6 +367,8 @@ struct dmub_srv_hw_funcs { 


	bool (*is_supported)(struct dmub_srv *dmub);



	bool (*is_psrsu_supported)(struct dmub_srv *dmub);



	bool (*is_hw_init)(struct dmub_srv *dmub);



	void (*enable_dmub_boot_options)(struct dmub_srv *dmub,

drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c

+5 −0
Original line number Diff line number Diff line
@@ -302,6 +302,11 @@ bool dmub_dcn31_is_supported(struct dmub_srv *dmub) 
	return supported;

}



bool dmub_dcn31_is_psrsu_supported(struct dmub_srv *dmub)

{

	return dmub->fw_version >= DMUB_FW_VERSION(4, 0, 59);

}



void dmub_dcn31_set_gpint(struct dmub_srv *dmub,

			  union dmub_gpint_data_register reg)

{