Commit 74b4afad authored May 19, 2021 by Mikita Lipski Committed by Alex Deucher Jun 08, 2021

drm/amd/display: Enable PSR Residency for multiple panels



[why]
Allow specifying which panel to take PSR Residency
measurements from.
[how]
Pass panel instance to DMUB through GPINT in the upper
8 bits of the parameter.

Signed-off-by: Mikita Lipski <mikita.lipski@amd.com>
Reviewed-by: Nicholas Kazlauskas <Nicholas.Kazlauskas@amd.com>
Acked-by: Stylon Wang <stylon.wang@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 5c69cc55

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

+6 −2

Original line number	Diff line number	Diff line
		@@ -2940,10 +2940,14 @@ void dc_link_get_psr_residency(const struct dc_link link, uint32_t residency)
		{
		struct dc *dc = link->ctx->dc;
		struct dmub_psr *psr = dc->res_pool->psr;
		unsigned int panel_inst;

		if (!dc_get_edp_link_panel_inst(dc, link, &panel_inst))
		return;

		// PSR residency measurements only supported on DMCUB
		/* PSR residency measurements only supported on DMCUB */
		if (psr != NULL && link->psr_settings.psr_feature_enabled)
		psr->funcs->psr_get_residency(psr, residency);
		psr->funcs->psr_get_residency(psr, residency, panel_inst);
		else
		*residency = 0;
		}

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

+4 −3

Original line number	Diff line number	Diff line
		@@ -327,12 +327,13 @@ static void dmub_psr_force_static(struct dmub_psr *dmub, uint8_t panel_inst)
		/*
		* Get PSR residency from firmware.
		*/
		static void dmub_psr_get_residency(struct dmub_psr dmub, uint32_t residency)
		static void dmub_psr_get_residency(struct dmub_psr dmub, uint32_t residency, uint8_t panel_inst)
		{
		struct dmub_srv *srv = dmub->ctx->dmub_srv->dmub;
		uint16_t param = (uint16_t)(panel_inst << 8);

		// Send gpint command and wait for ack
		dmub_srv_send_gpint_command(srv, DMUB_GPINT__PSR_RESIDENCY, 0, 30);
		/* Send gpint command and wait for ack */
		dmub_srv_send_gpint_command(srv, DMUB_GPINT__PSR_RESIDENCY, param, 30);

		dmub_srv_get_gpint_response(srv, residency);
		}

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,8 @@ struct dmub_psr_funcs {
		void (psr_set_level)(struct dmub_psr dmub, uint16_t psr_level,
		uint8_t panel_inst);
		void (psr_force_static)(struct dmub_psr dmub, uint8_t panel_inst);
		void (psr_get_residency)(struct dmub_psr dmub, uint32_t *residency);
		void (psr_get_residency)(struct dmub_psr dmub, uint32_t *residency,
		uint8_t panel_inst);
		};

		struct dmub_psr dmub_psr_create(struct dc_context ctx);