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

drm/amd/display: Add driver support for enabling PSR on DMCUB 



[Why]
We want to be able to enable PSR on DMCUB, and fallback to
DMCU when necessary.

[How]
Add infrastructure to enable and disable PSR on DMCUB.

Signed-off-by: default avatarWyatt Wood <wyatt.wood@amd.com>
Reviewed-by: default avatarNicholas Kazlauskas <Nicholas.Kazlauskas@amd.com>
Acked-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7895303b

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

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
#include "dpcd_defs.h"

#include "dmcu.h"

#include "hw/clk_mgr.h"

#include "../dce/dmub_psr.h"

#include "dce/dmub_psr.h"



#define DC_LOGGER_INIT(logger)
@@ -2433,7 +2433,7 @@ bool dc_link_set_psr_allow_active(struct dc_link *link, bool allow_active, bool 
	struct dmcu *dmcu = dc->res_pool->dmcu;

	struct dmub_psr *psr = dc->res_pool->psr;



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

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

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

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

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

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

+1 −0
Original line number Diff line number Diff line
@@ -410,6 +410,7 @@ struct dc_debug_options { 
	bool dmub_offload_enabled;

	bool dmcub_emulation;

	bool dmub_command_table; /* for testing only */

	bool psr_on_dmub;

	struct dc_bw_validation_profile bw_val_profile;

	bool disable_fec;

	bool disable_48mhz_pwrdwn;

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

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#ifndef DC_LINK_H_

#define DC_LINK_H_



#include "dc.h"

#include "dc_types.h"

#include "grph_object_defs.h"

drivers/gpu/drm/amd/display/dc/dce/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
DCE = dce_audio.o dce_stream_encoder.o dce_link_encoder.o dce_hwseq.o \

dce_mem_input.o dce_clock_source.o dce_scl_filters.o dce_transform.o \

dce_opp.o dce_dmcu.o dce_abm.o dce_ipp.o dce_aux.o \

dce_i2c.o dce_i2c_hw.o dce_i2c_sw.o

dce_i2c.o dce_i2c_hw.o dce_i2c_sw.o dmub_psr.o



AMD_DAL_DCE = $(addprefix $(AMDDALPATH)/dc/dce/,$(DCE))

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

+3 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include "dc.h"

#include "dc_dmub_srv.h"

#include "../../dmub/inc/dmub_srv.h"

#include "dmub_fw_state.h"

#include "../../dmub/inc/dmub_gpint_cmd.h"

#include "core_types.h"



#define MAX_PIPES 6
@@ -131,8 +131,9 @@ static bool dmub_psr_copy_settings(struct dmub_psr *dmub, 
		= &cmd.psr_copy_settings.psr_copy_settings_data;

	struct pipe_ctx *pipe_ctx = NULL;

	struct resource_context *res_ctx = &link->ctx->dc->current_state->res_ctx;

	int i = 0;



	for (int i = 0; i < MAX_PIPES; i++) {

	for (i = 0; i < MAX_PIPES; i++) {

		if (res_ctx &&

			res_ctx->pipe_ctx[i].stream &&

			res_ctx->pipe_ctx[i].stream->link &&

CRA Git | Maintained and supported by SUSTech CRA and CCSE