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>

diff --git a/drivers/gpu/drm/amd/display/dmub/inc/dmub_srv.h b/drivers/gpu/drm/amd/display/dmub/inc/dmub_srv.h
index 6f3eca266694eb16d5b2bf8a2fdec8320c597f7f..fdedbe15e026161d20ce086d3c86f5367b2f5e34 100644 (file)
--- a/drivers/gpu/drm/amd/display/dmub/inc/dmub_srv.h
+++ b/drivers/gpu/drm/amd/display/dmub/inc/dmub_srv.h
@@ -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;
 };
 
 /**

diff --git a/drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c b/drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c
index 2d63ae80bda92e7ea03e1abebf02a6e0921a3101..0dd32edbbcb39971239c4b197bfd049c7e8617a1 100644 (file)
--- a/drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c
+++ b/drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c
@@ -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);
        }