drm/amd/display: Add dpia debug options

[Why & How]
To add support for dpia debug options.

Reviewed-by: Jimmy Kizito <Jimmy.Kizito@amd.com>
Acked-by: Wayne Lin <Wayne.Lin@amd.com>
Acked-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Meenakshikumar Somasundaram <meenakshikumar.somasundaram@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index ed67f0048e6e485c06aa95534e1824418a6d6cb5..5185c2d512f79acff7c2e1c31e164fd7b02427fe 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -496,6 +496,14 @@ union root_clock_optimization_options {
        uint32_t u32All;
 };
 
+union dpia_debug_options {
+       struct {
+               uint32_t disable_dpia:1;
+               uint32_t reserved:31;
+       } bits;
+       uint32_t raw;
+};
+
 struct dc_debug_data {
        uint32_t ltFailCount;
        uint32_t i2cErrorCount;
@@ -668,6 +676,7 @@ struct dc_debug_options {
 #if defined(CONFIG_DRM_AMD_DC_DCN)
        bool disable_z10;
        bool enable_sw_cntl_psr;
+       union dpia_debug_options dpia_debug;
 #endif
 };
 

diff --git a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
index 2e021f9345c0c8af79c82a0dcda6f2204465cb04..7cb7604a35eb1b46310af25021991e37ae2a6c0d 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
@@ -2428,7 +2428,8 @@ static bool dcn31_resource_construct(
        }
 
        if (dc->ctx->asic_id.chip_family == FAMILY_YELLOW_CARP &&
-           dc->ctx->asic_id.hw_internal_rev == YELLOW_CARP_B0) {
+           dc->ctx->asic_id.hw_internal_rev == YELLOW_CARP_B0 &&
+           !dc->debug.dpia_debug.bits.disable_dpia) {
                /* YELLOW CARP B0 has 4 DPIA's */
                pool->base.usb4_dpia_count = 4;
        }

diff --git a/drivers/gpu/drm/amd/display/dmub/dmub_srv.h b/drivers/gpu/drm/amd/display/dmub/dmub_srv.h
index 7a86c97af91037ff39a27a64bccb56bbfc4a7563..365fbc4758e1fbae4bd1ab28ea6f58df246c57e5 100644 (file)
--- a/drivers/gpu/drm/amd/display/dmub/dmub_srv.h
+++ b/drivers/gpu/drm/amd/display/dmub/dmub_srv.h
@@ -237,6 +237,7 @@ struct dmub_srv_hw_params {
        bool load_inst_const;
        bool skip_panel_power_sequence;
        bool disable_z10;
+       bool disable_dpia;
 };
 
 /**

diff --git a/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h b/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
index bf71bec449eea6295ab10b9f7b550ca9d594184d..0b9d6bf4886de4f388e5e4a80030bc78639e41f6 100644 (file)
--- a/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
+++ b/drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h
@@ -368,8 +368,7 @@ union dmub_fw_boot_options {
                uint32_t disable_clk_gate: 1; /**< 1 if clock gating should be disabled */
                uint32_t skip_phy_init_panel_sequence: 1; /**< 1 to skip panel init seq */
                uint32_t z10_disable: 1; /**< 1 to disable z10 */
-               uint32_t reserved2: 1; /**< reserved for an unreleased feature */
-               uint32_t reserved_unreleased1: 1; /**< reserved for an unreleased feature */
+               uint32_t enable_dpia: 1; /**< 1 if DPIA should be enabled */
                uint32_t invalid_vbios_data: 1; /**< 1 if VBIOS data table is invalid */
                uint32_t reserved_unreleased2: 1; /**< reserved for an unreleased feature */
                uint32_t reserved : 22; /**< reserved */

diff --git a/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c b/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c
index 6ac370c15dea2cbc2befcd1b533aba79fc788808..3988f65f1ea48dc183f5d9c3dce8e23273d3483a 100644 (file)
--- a/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c
+++ b/drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c
@@ -338,6 +338,7 @@ void dmub_dcn31_enable_dmub_boot_options(struct dmub_srv *dmub, const struct dmu
        union dmub_fw_boot_options boot_options = {0};
 
        boot_options.bits.z10_disable = params->disable_z10;
+       boot_options.bits.enable_dpia = params->disable_dpia ? 0 : 1;
 
        REG_WRITE(DMCUB_SCRATCH14, boot_options.all);
 }