Commit ab16c736 authored Oct 30, 2019 by Nicholas Kazlauskas Committed by Alex Deucher Nov 19, 2019

drm/amd/display: Add DMUB param to load inst const from driver



[Why]
By default we shouldn't be trying to write secure registers during
DMUB hardware init.

[How]
Add a parameter to control whether we put the DMCUB into secure reset
and attempt to load CW0/CW1.

Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent c09eeee4

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -281,12 +281,14 @@ struct dmub_srv_create_params {
		* @fb_base: base of the framebuffer aperture
		* @fb_offset: offset of the framebuffer aperture
		* @psp_version: psp version to pass for DMCU init
		* @load_inst_const: true if DMUB should load inst const fw
		*/
		struct dmub_srv_hw_params {
		struct dmub_fb *fb[DMUB_WINDOW_TOTAL];
		uint64_t fb_base;
		uint64_t fb_offset;
		uint32_t psp_version;
		bool load_inst_const;
		};

		/**

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -278,7 +278,7 @@ enum dmub_status dmub_srv_hw_init(struct dmub_srv *dmub,
		cw1.region.base = DMUB_CW1_BASE;
		cw1.region.top = cw1.region.base + stack_fb->size - 1;

		if (dmub->hw_funcs.backdoor_load)
		if (params->load_inst_const && dmub->hw_funcs.backdoor_load)
		dmub->hw_funcs.backdoor_load(dmub, &cw0, &cw1);
		}