drm/amd/display: Set the DML2 attribute to false in all DCNs older than version 3.5

When DML2 was introduced, it targeted only new DCN versions. For
controlling which ASIC should use this new version of DML, it was
introduced the using_dml2 attribute. To avoid ambiguities, this commit
explicitly sets using_dml2 to false in all ASICs that do not support
DML2.

Cc: Vitaly Prosyak <vprosyak@amd.com>
Cc: Roman Li <roman.li@amd.com>
Cc: Qingqing Zhuo <Qingqing.Zhuo@amd.com>
Cc: Daniel Wheeler <daniel.wheeler@amd.com>
Cc: Alex Deucher <Alexander.Deucher@amd.com>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
index d1d8e904346e25aee0e288bd73ba6d6e198179cc..b94c5c97eee77746c31a546f6e01efac48e8992d 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
@@ -554,6 +554,7 @@ static const struct dc_debug_options debug_defaults_drv = {
                .max_downscale_src_width = 3840,
                .underflow_assert_delay_us = 0xFFFFFFFF,
                .enable_legacy_fast_update = true,
+               .using_dml2 = false,
 };
 
 static const struct dc_debug_options debug_defaults_diags = {

diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
index 7eda4bbcd8ac5c8defeb5406e28460331e128d2b..0a422fbb14bc84f95cbdf8dae267fb5d5f2ab46f 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
@@ -723,6 +723,7 @@ static const struct dc_debug_options debug_defaults_drv = {
                .sanity_checks = false,
                .underflow_assert_delay_us = 0xFFFFFFFF,
                .enable_legacy_fast_update = true,
+               .using_dml2 = false,
 };
 
 void dcn20_dpp_destroy(struct dpp **dpp)

diff --git a/drivers/gpu/drm/amd/display/dc/dcn201/dcn201_resource.c b/drivers/gpu/drm/amd/display/dc/dcn201/dcn201_resource.c
index a11b2f6afe4a8a4f07f1b12d43c8a452714bb23e..bca22d86769693b0345d4e5f9fc51f26646ded6d 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn201/dcn201_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn201/dcn201_resource.c
@@ -614,6 +614,7 @@ static const struct dc_debug_options debug_defaults_drv = {
                .underflow_assert_delay_us = 0xFFFFFFFF,
                .enable_tri_buf = false,
                .enable_legacy_fast_update = true,
+               .using_dml2 = false,
 };
 
 static void dcn201_dpp_destroy(struct dpp **dpp)

diff --git a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c b/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c
index 58a0d37e95233838c0520aac5dcf7a93143c2c4b..42277b280586e57d1ae4198fbc9181c6bc72c3b1 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c
@@ -654,6 +654,7 @@ static const struct dc_debug_options debug_defaults_drv = {
                .dmub_command_table = true,
                .use_max_lb = true,
                .enable_legacy_fast_update = true,
+               .using_dml2 = false,
 };
 
 static const struct dc_panel_config panel_config_defaults = {

diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c
index 473581cff06b43e4793fec202867412824b8c228..7b259cb5f418784ca93696c7eb8736fc5b98a601 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c
@@ -729,6 +729,7 @@ static const struct dc_debug_options debug_defaults_drv = {
        .use_max_lb = true,
        .exit_idle_opt_for_cursor_updates = true,
        .enable_legacy_fast_update = false,
+       .using_dml2 = false,
 };
 
 static const struct dc_panel_config panel_config_defaults = {

diff --git a/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c b/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c
index b4b3b52990b9d31846d3abc7da735e432dbd7795..f3b75f283aa2577fa370eab2fd40ffa36bc2e3c0 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c
@@ -701,7 +701,8 @@ static const struct dc_debug_options debug_defaults_drv = {
        .dwb_fi_phase = -1, // -1 = disable
        .dmub_command_table = true,
        .use_max_lb = false,
-       .exit_idle_opt_for_cursor_updates = true
+       .exit_idle_opt_for_cursor_updates = true,
+       .using_dml2 = false,
 };
 
 static void dcn301_dpp_destroy(struct dpp **dpp)

diff --git a/drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c b/drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c
index 06332bd4e62530287e261957deb77ddb9e53333b..63ac984a04f7ed10b9c7c33a127bc59b2f402f15 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c
@@ -99,6 +99,7 @@ static const struct dc_debug_options debug_defaults_drv = {
                .use_max_lb = true,
                .exit_idle_opt_for_cursor_updates = true,
                .enable_legacy_fast_update = false,
+               .using_dml2 = false,
 };
 
 static const struct dc_panel_config panel_config_defaults = {

diff --git a/drivers/gpu/drm/amd/display/dc/dcn303/dcn303_resource.c b/drivers/gpu/drm/amd/display/dc/dcn303/dcn303_resource.c
index 0d91291a54a928d8c5075709bf08c2172db5d118..3f0b52f50d934ca10c32fa86f615b247ef915407 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn303/dcn303_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn303/dcn303_resource.c
@@ -81,6 +81,7 @@ static const struct dc_debug_options debug_defaults_drv = {
                .dmub_command_table = true,
                .exit_idle_opt_for_cursor_updates = true,
                .disable_idle_power_optimizations = false,
+               .using_dml2 = false,
 };
 
 static const struct dc_panel_config panel_config_defaults = {

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 cdf005f918695221908fc153bfc1c259a40a30c3..79416cfb22f09d893caf5ebacf3ba8f8b33e250a 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
@@ -893,6 +893,7 @@ static const struct dc_debug_options debug_defaults_drv = {
        .enable_legacy_fast_update = true,
        .enable_z9_disable_interface = true, /* Allow support for the PMFW interface for disable Z9*/
        .dml_hostvm_override = DML_HOSTVM_OVERRIDE_FALSE,
+       .using_dml2 = false,
 };
 
 static const struct dc_panel_config panel_config_defaults = {

diff --git a/drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c b/drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c
index 2d7436f2ea82ccef91b02a22224b53c0f744ae0b..ab301ea7c10bd0543b188aace6badddf3735ec31 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c
@@ -924,7 +924,8 @@ static const struct dc_debug_options debug_defaults_drv = {
                        }
        },
 
-       .seamless_boot_odm_combine = true
+       .seamless_boot_odm_combine = true,
+       .using_dml2 = false,
 };
 
 static const struct dc_debug_options debug_defaults_diags = {

diff --git a/drivers/gpu/drm/amd/display/dc/dcn315/dcn315_resource.c b/drivers/gpu/drm/amd/display/dc/dcn315/dcn315_resource.c
index c11dbb1f40336e17b2f5ff0df3964ce6cf598622..cb8024eee8e4d90cfd4559c1508a5a7e450750b0 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn315/dcn315_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn315/dcn315_resource.c
@@ -889,6 +889,7 @@ static const struct dc_debug_options debug_defaults_drv = {
        },
        .enable_legacy_fast_update = true,
        .psr_power_use_phy_fsm = 0,
+       .using_dml2 = false,
 };
 
 static const struct dc_panel_config panel_config_defaults = {

diff --git a/drivers/gpu/drm/amd/display/dc/dcn316/dcn316_resource.c b/drivers/gpu/drm/amd/display/dc/dcn316/dcn316_resource.c
index 4220fe4cae4ae80ad776fb7bda9375b09aec0b17..b9753d4606f89d53d709e4f2bbb9c3e0f4dc0928 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn316/dcn316_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn316/dcn316_resource.c
@@ -885,6 +885,7 @@ static const struct dc_debug_options debug_defaults_drv = {
                }
        },
        .enable_legacy_fast_update = true,
+       .using_dml2 = false,
 };
 
 static const struct dc_panel_config panel_config_defaults = {

diff --git a/drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c b/drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c
index 44caf6711589d9e8086fa3a96d93fe82720e7fce..0b1ce6e28e11cbe0aa9fd4ff8d125b4edff6e9f2 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c
@@ -732,6 +732,7 @@ static const struct dc_debug_options debug_defaults_drv = {
        .fpo_vactive_max_blank_us = 1000,
        .enable_legacy_fast_update = false,
        .disable_dc_mode_overwrite = true,
+       .using_dml2 = false,
 };
 
 static struct dce_aux *dcn321_aux_engine_create(