drm/amd/display: Apply DML21 Patches

[Why & How]
Add several DML21 fixes

Reviewed-by: Wenjing Liu <wenjing.liu@amd.com>
Signed-off-by: Austin Zheng <Austin.Zheng@amd.com>
Signed-off-by: Tom Chung <chiahsuan.chung@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4_calcs.c b/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4_calcs.c
index a3ffb8c95d253330dc5b5a7d818f8720c76b2e50..c4dbf27abaf8450fb53eedb76c0a664116c51efd 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4_calcs.c
+++ b/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4_calcs.c
@@ -3528,10 +3528,9 @@ static void CalculateUrgentBurstFactor(
        dml2_printf("DML::%s: UrgentBurstFactorChroma = %f\n", __func__, *UrgentBurstFactorChroma);
        dml2_printf("DML::%s: NotEnoughUrgentLatencyHiding = %d\n", __func__, *NotEnoughUrgentLatencyHiding);
 #endif
-
 }
 
-static void CalculateDCFCLKDeepSleep(
+static void CalculateDCFCLKDeepSleepTdlut(
        const struct dml2_display_cfg *display_cfg,
        unsigned int NumberOfActiveSurfaces,
        unsigned int BytePerPixelY[],
@@ -3546,6 +3545,10 @@ static void CalculateDCFCLKDeepSleep(
        double ReadBandwidthChroma[],
        unsigned int ReturnBusWidth,
 
+       double dispclk,
+       unsigned int tdlut_bytes_to_deliver[],
+       double prefetch_swath_time_us[],
+
        // Output
        double *DCFClkDeepSleep)
 {
@@ -3580,6 +3583,22 @@ static void CalculateDCFCLKDeepSleep(
                }
                DCFClkDeepSleepPerSurface[k] = math_max2(DCFClkDeepSleepPerSurface[k], pixel_rate_mhz / 16);
 
+               // adjust for 3dlut delivery time
+               if (display_cfg->plane_descriptors[k].tdlut.setup_for_tdlut && tdlut_bytes_to_deliver[k] > 0) {
+                       double tdlut_required_deepsleep_dcfclk = (double) tdlut_bytes_to_deliver[k] / 64.0 / prefetch_swath_time_us[k];
+
+                       dml2_printf("DML::%s: k=%d, DCFClkDeepSleepPerSurface = %f\n", __func__, k, DCFClkDeepSleepPerSurface[k]);
+                       dml2_printf("DML::%s: k=%d, tdlut_bytes_to_deliver = %d\n", __func__, k, tdlut_bytes_to_deliver[k]);
+                       dml2_printf("DML::%s: k=%d, prefetch_swath_time_us = %f\n", __func__, k, prefetch_swath_time_us[k]);
+                       dml2_printf("DML::%s: k=%d, tdlut_required_deepsleep_dcfclk = %f\n", __func__, k, tdlut_required_deepsleep_dcfclk);
+
+                       // increase the deepsleep dcfclk to match the original dispclk throughput rate
+                       if (tdlut_required_deepsleep_dcfclk > DCFClkDeepSleepPerSurface[k]) {
+                               DCFClkDeepSleepPerSurface[k] = math_max2(DCFClkDeepSleepPerSurface[k], tdlut_required_deepsleep_dcfclk);
+                               DCFClkDeepSleepPerSurface[k] = math_max2(DCFClkDeepSleepPerSurface[k], dispclk / 4.0);
+                       }
+               }
+
 #ifdef __DML_VBA_DEBUG__
                dml2_printf("DML::%s: k=%u, PixelClock = %f\n", __func__, k, pixel_rate_mhz);
                dml2_printf("DML::%s: k=%u, DCFClkDeepSleepPerSurface = %f\n", __func__, k, DCFClkDeepSleepPerSurface[k]);
@@ -3602,9 +3621,56 @@ static void CalculateDCFCLKDeepSleep(
        for (unsigned int k = 0; k < NumberOfActiveSurfaces; ++k) {
                *DCFClkDeepSleep = math_max2(*DCFClkDeepSleep, DCFClkDeepSleepPerSurface[k]);
        }
+
        dml2_printf("DML::%s: DCFClkDeepSleep = %f (final)\n", __func__, *DCFClkDeepSleep);
 }
 
+static void CalculateDCFCLKDeepSleep(
+       const struct dml2_display_cfg *display_cfg,
+       unsigned int NumberOfActiveSurfaces,
+       unsigned int BytePerPixelY[],
+       unsigned int BytePerPixelC[],
+       unsigned int SwathWidthY[],
+       unsigned int SwathWidthC[],
+       unsigned int DPPPerSurface[],
+       double PSCL_THROUGHPUT[],
+       double PSCL_THROUGHPUT_CHROMA[],
+       double Dppclk[],
+       double ReadBandwidthLuma[],
+       double ReadBandwidthChroma[],
+       unsigned int ReturnBusWidth,
+
+       // Output
+       double *DCFClkDeepSleep)
+{
+       double zero_double[DML2_MAX_PLANES];
+       unsigned int zero_integer[DML2_MAX_PLANES];
+
+       memset(zero_double, 0, DML2_MAX_PLANES * sizeof(double));
+       memset(zero_integer, 0, DML2_MAX_PLANES * sizeof(unsigned int));
+
+       CalculateDCFCLKDeepSleepTdlut(
+               display_cfg,
+               NumberOfActiveSurfaces,
+               BytePerPixelY,
+               BytePerPixelC,
+               SwathWidthY,
+               SwathWidthC,
+               DPPPerSurface,
+               PSCL_THROUGHPUT,
+               PSCL_THROUGHPUT_CHROMA,
+               Dppclk,
+               ReadBandwidthLuma,
+               ReadBandwidthChroma,
+               ReturnBusWidth,
+               0,
+               zero_integer, //tdlut_bytes_to_deliver,
+               zero_double, //prefetch_swath_time_us,
+
+               // Output
+               DCFClkDeepSleep);
+}
+
 static double CalculateWriteBackDelay(
        enum dml2_source_format_class WritebackPixelFormat,
        double WritebackHRatio,
@@ -4604,6 +4670,7 @@ static void calculate_tdlut_setting(
                *p->tdlut_groups_per_2row_ub = 0;
                *p->tdlut_opt_time = 0;
                *p->tdlut_drain_time = 0;
+               *p->tdlut_bytes_to_deliver = 0;
                *p->tdlut_bytes_per_group = 0;
                *p->tdlut_pte_bytes_per_frame = 0;
                *p->tdlut_bytes_per_frame = 0;
@@ -4672,6 +4739,7 @@ static void calculate_tdlut_setting(
                *p->tdlut_groups_per_2row_ub = (unsigned int)math_ceil2((double) *p->tdlut_bytes_per_frame / *p->tdlut_bytes_per_group, 1);
                *p->tdlut_opt_time = (*p->tdlut_bytes_per_frame - p->cursor_buffer_size * 1024) / tdlut_drain_rate;
                *p->tdlut_drain_time = p->cursor_buffer_size * 1024 / tdlut_drain_rate;
+               *p->tdlut_bytes_to_deliver = (unsigned int) (p->cursor_buffer_size * 1024.0);
        }
 
 #ifdef __DML_VBA_DEBUG__
@@ -4692,6 +4760,7 @@ static void calculate_tdlut_setting(
        dml2_printf("DML::%s: tdlut_delivery_cycles = %u\n", __func__, tdlut_delivery_cycles);
        dml2_printf("DML::%s: tdlut_opt_time = %f\n", __func__, *p->tdlut_opt_time);
        dml2_printf("DML::%s: tdlut_drain_time = %f\n", __func__, *p->tdlut_drain_time);
+       dml2_printf("DML::%s: tdlut_bytes_to_deliver = %d\n", __func__, *p->tdlut_bytes_to_deliver);
        dml2_printf("DML::%s: tdlut_groups_per_2row_ub = %d\n", __func__, *p->tdlut_groups_per_2row_ub);
 #endif
 }
@@ -5700,6 +5769,7 @@ static bool CalculatePrefetchSchedule(struct dml2_core_internal_scratch *scratch
 
                s->cursor_prefetch_bytes = (unsigned int)math_max2(p->cursor_bytes_per_chunk, 4 * p->cursor_bytes_per_line);
                *p->prefetch_cursor_bw = p->num_cursors * s->cursor_prefetch_bytes / (s->LinesToRequestPrefetchPixelData * s->LineTime);
+               *p->prefetch_swath_time_us = (s->LinesToRequestPrefetchPixelData * s->LineTime);
 
 #ifdef __DML_VBA_DEBUG__
                dml2_printf("DML::%s: TimeForFetchingVM = %f\n", __func__, s->TimeForFetchingVM);
@@ -5710,6 +5780,7 @@ static bool CalculatePrefetchSchedule(struct dml2_core_internal_scratch *scratch
                dml2_printf("DML::%s: dst_y_per_row_vblank = %f\n", __func__, *p->dst_y_per_row_vblank);
                dml2_printf("DML::%s: LinesToRequestPrefetchPixelData = %f\n", __func__, s->LinesToRequestPrefetchPixelData);
                dml2_printf("DML::%s: PrefetchSourceLinesY = %f\n", __func__, p->PrefetchSourceLinesY);
+               dml2_printf("DML::%s: prefetch_swath_time_us = %f\n", __func__, *p->prefetch_swath_time_us);
 
                dml2_printf("DML::%s: cursor_bytes_per_chunk = %d\n", __func__, p->cursor_bytes_per_chunk);
                dml2_printf("DML::%s: cursor_bytes_per_line = %d\n", __func__, p->cursor_bytes_per_line);
@@ -8817,6 +8888,7 @@ static bool dml_core_mode_support(struct dml2_core_calcs_mode_support_ex *in_out
                        calculate_tdlut_setting_params->tdlut_groups_per_2row_ub = &s->tdlut_groups_per_2row_ub[k];
                        calculate_tdlut_setting_params->tdlut_opt_time = &s->tdlut_opt_time[k];
                        calculate_tdlut_setting_params->tdlut_drain_time = &s->tdlut_drain_time[k];
+                       calculate_tdlut_setting_params->tdlut_bytes_to_deliver = &s->tdlut_bytes_to_deliver[k];
                        calculate_tdlut_setting_params->tdlut_bytes_per_group = &s->tdlut_bytes_per_group[k];
 
                        calculate_tdlut_setting(&mode_lib->scratch, calculate_tdlut_setting_params);
@@ -9009,6 +9081,7 @@ static bool dml_core_mode_support(struct dml2_core_calcs_mode_support_ex *in_out
                                CalculatePrefetchSchedule_params->prefetch_sw_bytes = &s->prefetch_sw_bytes[k];
                                CalculatePrefetchSchedule_params->Tpre_rounded = &s->Tpre_rounded[k];
                                CalculatePrefetchSchedule_params->Tpre_oto = &s->Tpre_oto[k];
+                               CalculatePrefetchSchedule_params->prefetch_swath_time_us = &s->prefetch_swath_time_us[k];
 
                                mode_lib->ms.NoTimeForPrefetch[k] = CalculatePrefetchSchedule(&mode_lib->scratch, CalculatePrefetchSchedule_params);
 
@@ -9017,6 +9090,27 @@ static bool dml_core_mode_support(struct dml2_core_calcs_mode_support_ex *in_out
                                dml2_printf("DML::%s: k=%d, dst_y_per_row_vblank = %f\n", __func__, k, *CalculatePrefetchSchedule_params->dst_y_per_row_vblank);
                        } // for k num_planes
 
+                       CalculateDCFCLKDeepSleepTdlut(
+                               display_cfg,
+                               mode_lib->ms.num_active_planes,
+                               mode_lib->ms.BytePerPixelY,
+                               mode_lib->ms.BytePerPixelC,
+                               mode_lib->ms.SwathWidthY,
+                               mode_lib->ms.SwathWidthC,
+                               mode_lib->ms.NoOfDPP,
+                               mode_lib->ms.PSCL_FACTOR,
+                               mode_lib->ms.PSCL_FACTOR_CHROMA,
+                               mode_lib->ms.RequiredDPPCLK,
+                               mode_lib->ms.vactive_sw_bw_l,
+                               mode_lib->ms.vactive_sw_bw_c,
+                               mode_lib->soc.return_bus_width_bytes,
+                               mode_lib->ms.RequiredDISPCLK,
+                               s->tdlut_bytes_to_deliver,
+                               s->prefetch_swath_time_us,
+
+                               /* Output */
+                               &mode_lib->ms.dcfclk_deepsleep);
+
                        for (k = 0; k < mode_lib->ms.num_active_planes; k++) {
                                if (mode_lib->ms.dst_y_prefetch[k] < 2.0
                                        || mode_lib->ms.LinesForVM[k] >= 32.0
@@ -10368,12 +10462,6 @@ static bool dml_core_mode_programming(struct dml2_core_calcs_mode_programming_ex
        dml2_assert(s->SOCCLK > 0);
 
 #ifdef __DML_VBA_DEBUG__
-       // dml2_printf_dml_display_cfg_timing(&display_cfg->timing, s->num_active_planes);
-       // dml2_printf_dml_display_cfg_plane(&display_cfg->plane, s->num_active_planes);
-       // dml2_printf_dml_display_cfg_surface(&display_cfg->surface, s->num_active_planes);
-       // dml2_printf_dml_display_cfg_output(&display_cfg->output, s->num_active_planes);
-       // dml2_printf_dml_display_cfg_hw_resource(&display_cfg->hw, s->num_active_planes);
-
        dml2_printf("DML::%s: num_active_planes = %u\n", __func__, s->num_active_planes);
        dml2_printf("DML::%s: num_active_pipes = %u\n", __func__, mode_lib->mp.num_active_pipes);
        dml2_printf("DML::%s: Dcfclk = %f\n", __func__, mode_lib->mp.Dcfclk);
@@ -10832,8 +10920,8 @@ static bool dml_core_mode_programming(struct dml2_core_calcs_mode_programming_ex
                calculate_tdlut_setting_params->tdlut_groups_per_2row_ub = &s->tdlut_groups_per_2row_ub[k];
                calculate_tdlut_setting_params->tdlut_opt_time = &s->tdlut_opt_time[k];
                calculate_tdlut_setting_params->tdlut_drain_time = &s->tdlut_drain_time[k];
+               calculate_tdlut_setting_params->tdlut_bytes_to_deliver = &s->tdlut_bytes_to_deliver[k];
                calculate_tdlut_setting_params->tdlut_bytes_per_group = &s->tdlut_bytes_per_group[k];
-
                calculate_tdlut_setting(&mode_lib->scratch, calculate_tdlut_setting_params);
        }
 
@@ -11219,6 +11307,7 @@ static bool dml_core_mode_programming(struct dml2_core_calcs_mode_programming_ex
                        CalculatePrefetchSchedule_params->prefetch_sw_bytes = &s->prefetch_sw_bytes[k];
                        CalculatePrefetchSchedule_params->Tpre_rounded = &s->Tpre_rounded[k];
                        CalculatePrefetchSchedule_params->Tpre_oto = &s->Tpre_oto[k];
+                       CalculatePrefetchSchedule_params->prefetch_swath_time_us = &s->dummy_single[0];
 
                        mode_lib->mp.NoTimeToPrefetch[k] = CalculatePrefetchSchedule(&mode_lib->scratch, CalculatePrefetchSchedule_params);
 

diff --git a/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_shared_types.h b/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_shared_types.h
index 4f54e54102ef669b14c609f20ad05a788c07e871..23c0fca5515fef2258fbca17387accd1b5b99f8d 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_shared_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_shared_types.h
@@ -958,6 +958,7 @@ struct dml2_core_calcs_mode_support_locals {
        unsigned int tdlut_groups_per_2row_ub[DML2_MAX_PLANES];
        double tdlut_opt_time[DML2_MAX_PLANES];
        double tdlut_drain_time[DML2_MAX_PLANES];
+       unsigned int tdlut_bytes_to_deliver[DML2_MAX_PLANES];
        unsigned int tdlut_bytes_per_group[DML2_MAX_PLANES];
 
        unsigned int cursor_bytes_per_chunk[DML2_MAX_PLANES];
@@ -979,6 +980,7 @@ struct dml2_core_calcs_mode_support_locals {
        enum dml2_source_format_class pixel_format[DML2_MAX_PLANES];
        unsigned int lb_source_lines_l[DML2_MAX_PLANES];
        unsigned int lb_source_lines_c[DML2_MAX_PLANES];
+       double prefetch_swath_time_us[DML2_MAX_PLANES];
 };
 
 struct dml2_core_calcs_mode_programming_locals {
@@ -1042,6 +1044,7 @@ struct dml2_core_calcs_mode_programming_locals {
        unsigned int tdlut_groups_per_2row_ub[DML2_MAX_PLANES];
        double tdlut_opt_time[DML2_MAX_PLANES];
        double tdlut_drain_time[DML2_MAX_PLANES];
+       unsigned int tdlut_bytes_to_deliver[DML2_MAX_PLANES];
        unsigned int tdlut_bytes_per_group[DML2_MAX_PLANES];
 
        unsigned int cursor_bytes_per_chunk[DML2_MAX_PLANES];
@@ -1809,6 +1812,7 @@ struct dml2_core_calcs_CalculatePrefetchSchedule_params {
        unsigned int *VReadyOffsetPix;
        double *prefetch_cursor_bw;
        double *prefetch_sw_bytes;
+       double *prefetch_swath_time_us;
 };
 
 struct dml2_core_calcs_CheckGlobalPrefetchAdmissibility_params {
@@ -1993,6 +1997,7 @@ struct dml2_core_calcs_calculate_tdlut_setting_params {
        unsigned int *tdlut_groups_per_2row_ub;
        double *tdlut_opt_time;
        double *tdlut_drain_time;
+       unsigned int *tdlut_bytes_to_deliver;
        unsigned int *tdlut_bytes_per_group;
 };
 
@@ -2137,7 +2142,6 @@ struct dml2_core_calcs_mode_programming_ex {
        const struct core_display_cfg_support_info *cfg_support_info;
        int min_clk_index;
        struct dml2_display_cfg_programming *programming;
-
 };
 
 #endif

diff --git a/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_utils.c b/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_utils.c
index 1548dfc68b8e0233aa32df8dc96760f14e6e5118..456b3f8a6d38436cde92142f9e5b78f87961ec92 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_utils.c
+++ b/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_utils.c
@@ -556,7 +556,7 @@ bool dml2_core_utils_is_dual_plane(enum dml2_source_format_class source_format)
 {
        bool ret_val = 0;
 
-       if ((source_format == dml2_420_12) || (source_format == dml2_420_8) || (source_format == dml2_420_10) || (source_format == dml2_rgbe_alpha))
+       if (dml2_core_utils_is_420(source_format) || dml2_core_utils_is_422_planar(source_format) || (source_format == dml2_rgbe_alpha))
                ret_val = 1;
 
        return ret_val;

diff --git a/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn3.c b/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn3.c
index 655d1ef56814352e1e49acc2a79b5e84a6e7b71c..e763c8e45da8174e016b0b9a9bf692f24616a108 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn3.c
+++ b/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn3.c
@@ -347,8 +347,12 @@ static int find_highest_odm_load_stream_index(
        int odm_load, highest_odm_load = -1, highest_odm_load_index = -1;
 
        for (i = 0; i < display_config->num_streams; i++) {
-               odm_load = display_config->stream_descriptors[i].timing.pixel_clock_khz
+               if (mode_support_result->cfg_support_info.stream_support_info[i].odms_used > 0)
+                       odm_load = display_config->stream_descriptors[i].timing.pixel_clock_khz
                                / mode_support_result->cfg_support_info.stream_support_info[i].odms_used;
+               else
+                       odm_load = 0;
+
                if (odm_load > highest_odm_load) {
                        highest_odm_load_index = i;
                        highest_odm_load = odm_load;

diff --git a/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c b/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c
index 94609f9c18eb32cb20ad6552f670fae875321730..a3324f7b9ba68b1fbad539c6d87d2fe4a835c8d4 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c
+++ b/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c
@@ -813,8 +813,12 @@ static int find_highest_odm_load_stream_index(
        int odm_load, highest_odm_load = -1, highest_odm_load_index = -1;
 
        for (i = 0; i < display_config->num_streams; i++) {
-               odm_load = display_config->stream_descriptors[i].timing.pixel_clock_khz
+               if (mode_support_result->cfg_support_info.stream_support_info[i].odms_used > 0)
+                       odm_load = display_config->stream_descriptors[i].timing.pixel_clock_khz
                                / mode_support_result->cfg_support_info.stream_support_info[i].odms_used;
+               else
+                       odm_load = 0;
+
                if (odm_load > highest_odm_load) {
                        highest_odm_load_index = i;
                        highest_odm_load = odm_load;
@@ -1372,7 +1376,7 @@ static bool is_config_schedulable(
                        if (j_disallow_us < jp1_disallow_us) {
                                /* swap as A < B */
                                swap(s->pmo_dcn4.sorted_group_gtl_disallow_index[j],
-                                        s->pmo_dcn4.sorted_group_gtl_disallow_index[j+1]);
+                                        s->pmo_dcn4.sorted_group_gtl_disallow_index[j + 1]);
                                swapped = true;
                        }
                }
@@ -1431,7 +1435,7 @@ static bool is_config_schedulable(
                        if (j_period_us < jp1_period_us) {
                                /* swap as A < B */
                                swap(s->pmo_dcn4.sorted_group_gtl_period_index[j],
-                                        s->pmo_dcn4.sorted_group_gtl_period_index[j+1]);
+                                        s->pmo_dcn4.sorted_group_gtl_period_index[j + 1]);
                                swapped = true;
                        }
                }

diff --git a/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_interfaces.c b/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_interfaces.c
index 5f6dfc24df69dc1289f7bed143d8322afeb23b46..f88931ccbc5e71736de8eb2dbe82e8f9cd151da1 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_interfaces.c
+++ b/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_interfaces.c
@@ -15,7 +15,6 @@ bool dml2_initialize_instance(struct dml2_initialize_instance_in_out *in_out)
 {
        switch (in_out->options.project_id) {
        case dml2_project_dcn4x_stage1:
-               return false;
        case dml2_project_dcn4x_stage2:
        case dml2_project_dcn4x_stage2_auto_drr_svp:
                return dml2_top_soc15_initialize_instance(in_out);

diff --git a/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_legacy.c b/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_legacy.c
index db0a30fdb58d720696d154096523d5834ddd19c7..5e14d85821e27667dcc532b0934acfc3c1fcb3f4 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_legacy.c
+++ b/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_legacy.c
@@ -2,3 +2,9 @@
 //
 // Copyright 2024 Advanced Micro Devices, Inc.
 
+#include "dml2_top_legacy.h"
+#include "dml2_top_soc15.h"
+#include "dml2_core_factory.h"
+#include "dml2_pmo_factory.h"
+#include "display_mode_core_structs.h"
+

diff --git a/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_soc15.c b/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_soc15.c
index b39029c0e56f1db6ec265039564f533991193420..a8f58f8448e4279055cfd63accf9c5647aa53f38 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_soc15.c
+++ b/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_soc15.c
@@ -545,6 +545,7 @@ bool dml2_top_mcache_validate_admissability(struct top_mcache_validate_admissabi
                if (odm_combine_factor > 1) {
                        max_per_pipe_vp_p0 = plane->surface.plane0.width;
                        temp = (unsigned int)math_ceil(plane->composition.scaler_info.plane0.h_ratio * stream->timing.h_active / odm_combine_factor);
+
                        if (temp < max_per_pipe_vp_p0)
                                max_per_pipe_vp_p0 = temp;
 

diff --git a/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_soc15.h b/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_soc15.h
index 6fda201af898f4e94390346e392528baedb67c4a..53bd8602f9ef4ebf6113c5f322d2b5a9260028cb 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_soc15.h
+++ b/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_soc15.h
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 //
 // Copyright 2024 Advanced Micro Devices, Inc.
+
 #ifndef __DML2_TOP_SOC15_H__
 #define __DML2_TOP_SOC15_H__
 #include "dml2_internal_shared_types.h"

diff --git a/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/inc/dml2_internal_shared_types.h b/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/inc/dml2_internal_shared_types.h
index d94b310d6eec28390096f303320a12832acf10d0..7fb6026bcb49aca90cf69d7f636b00e7ec7eb7a8 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/inc/dml2_internal_shared_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/inc/dml2_internal_shared_types.h
@@ -357,8 +357,6 @@ struct dml2_pmo_pstate_strategy {
        enum dml2_pstate_method per_stream_pstate_method[DML2_MAX_PLANES];
        bool allow_state_increase;
 };
-
-
 struct dml2_core_mode_support_in_out {
        /*
        * Inputs