Commit a9edc815 authored by Wyatt Wood's avatar Wyatt Wood Committed by Alex Deucher
Browse files

drm/amd/display: Implement PSR wait for enable/disable 



[Why]
For DMUB implementation of PSR, the 'wait' parameter,
used to determine if driver should wait for PSR enable/disable,
is not implemented correctly.

[How]
Implement wait for PSR enable/disable.

Signed-off-by: default avatarWyatt Wood <wyatt.wood@amd.com>
Reviewed-by: default avatarAnthony Koo <Anthony.Koo@amd.com>
Acked-by: default avatarQingqing Zhuo <qingqing.zhuo@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b50d5551

drivers/gpu/drm/amd/display/dc/core/dc_link.c

+1 −1
Original line number Diff line number Diff line
@@ -2566,7 +2566,7 @@ bool dc_link_set_psr_allow_active(struct dc_link *link, bool allow_active, bool 
	link->psr_settings.psr_allow_active = allow_active;



	if (psr != NULL && link->psr_settings.psr_feature_enabled)

		psr->funcs->psr_enable(psr, allow_active);

		psr->funcs->psr_enable(psr, allow_active, wait);

	else if ((dmcu != NULL && dmcu->funcs->is_dmcu_initialized(dmcu)) && link->psr_settings.psr_feature_enabled)

		dmcu->funcs->set_psr_enable(dmcu, allow_active, wait);

	else

drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c

+26 −1
Original line number Diff line number Diff line
@@ -119,10 +119,11 @@ static bool dmub_psr_set_version(struct dmub_psr *dmub, struct dc_stream_state * 
/**

 * Enable/Disable PSR.

 */

static void dmub_psr_enable(struct dmub_psr *dmub, bool enable)

static void dmub_psr_enable(struct dmub_psr *dmub, bool enable, bool wait)

{

	union dmub_rb_cmd cmd;

	struct dc_context *dc = dmub->ctx;

	uint32_t retry_count, psr_state = 0;



	cmd.psr_enable.header.type = DMUB_CMD__PSR;
@@ -136,6 +137,30 @@ static void dmub_psr_enable(struct dmub_psr *dmub, bool enable) 
	dc_dmub_srv_cmd_queue(dc->dmub_srv, &cmd);

	dc_dmub_srv_cmd_execute(dc->dmub_srv);

	dc_dmub_srv_wait_idle(dc->dmub_srv);



	/* Below loops 1000 x 500us = 500 ms.

	 *  Exit PSR may need to wait 1-2 frames to power up. Timeout after at

	 *  least a few frames. Should never hit the max retry assert below.

	 */

	if (wait) {

		for (retry_count = 0; retry_count <= 1000; retry_count++) {

			dmub_psr_get_state(dmub, &psr_state);



			if (enable) {

				if (psr_state != 0)

					break;

			} else {

				if (psr_state == 0)

					break;

			}



			udelay(500);

		}



		/* assert if max retry hit */

		if (retry_count >= 1000)

			ASSERT(0);

	}

}



/**

drivers/gpu/drm/amd/display/dc/dce/dmub_psr.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ struct dmub_psr { 


struct dmub_psr_funcs {

	bool (*psr_copy_settings)(struct dmub_psr *dmub, struct dc_link *link, struct psr_context *psr_context);

	void (*psr_enable)(struct dmub_psr *dmub, bool enable);

	void (*psr_enable)(struct dmub_psr *dmub, bool enable, bool wait);

	void (*psr_get_state)(struct dmub_psr *dmub, uint32_t *psr_state);

	void (*psr_set_level)(struct dmub_psr *dmub, uint16_t psr_level);

};