drm/amd/display: correct type mismatches in comparisons in DML2

[Why]
Comparisons were made between unsigned char and unsigned int.

[How]
Corrected by changing variable types.

Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: Natanel Roizenman <Natanel.Roizenman@amd.com>
Signed-off-by: Roman Li <roman.li@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_dpmm/dml2_dpmm_dcn4.c b/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c
index d87a483f9d9367c12bb00cdfe0db201e04c27baf..fc77fb34a19a51ca1b8bdddc3f4fa84dad102559 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c
+++ b/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c
@@ -417,11 +417,11 @@ static bool map_min_clocks_to_dpm(const struct dml2_core_mode_support_result *mo
 
 static bool are_timings_trivially_synchronizable(struct dml2_display_cfg *display_config, int mask)
 {
-       unsigned char i;
+       unsigned int i;
        bool identical = true;
        bool contains_drr = false;
-       unsigned char remap_array[DML2_MAX_PLANES];
-       unsigned char remap_array_size = 0;
+       unsigned int remap_array[DML2_MAX_PLANES];
+       unsigned int remap_array_size = 0;
 
        // Create a remap array to enable simple iteration through only masked stream indicies
        for (i = 0; i < display_config->num_streams; i++) {
@@ -456,10 +456,10 @@ static bool are_timings_trivially_synchronizable(struct dml2_display_cfg *displa
 
 static int find_smallest_idle_time_in_vblank_us(struct dml2_dpmm_map_mode_to_soc_dpm_params_in_out *in_out, int mask)
 {
-       unsigned char i;
+       unsigned int i;
        int min_idle_us = 0;
-       unsigned char remap_array[DML2_MAX_PLANES];
-       unsigned char remap_array_size = 0;
+       unsigned int remap_array[DML2_MAX_PLANES];
+       unsigned int remap_array_size = 0;
        const struct dml2_core_mode_support_result *mode_support_result = &in_out->display_cfg->mode_support_result;
 
        // Create a remap array to enable simple iteration through only masked stream indicies

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 a31db5742675d001cbce130af583f73673ecf482..655d1ef56814352e1e49acc2a79b5e84a6e7b71c 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
@@ -195,11 +195,11 @@ static int count_planes_with_stream_index(const struct dml2_display_cfg *display
 
 static bool are_timings_trivially_synchronizable(struct display_configuation_with_meta *display_config, int mask)
 {
-       unsigned char i;
+       unsigned int i;
        bool identical = true;
        bool contains_drr = false;
-       unsigned char remap_array[DML2_MAX_PLANES];
-       unsigned char remap_array_size = 0;
+       unsigned int remap_array[DML2_MAX_PLANES];
+       unsigned int remap_array_size = 0;
 
        // Create a remap array to enable simple iteration through only masked stream indicies
        for (i = 0; i < display_config->display_config.num_streams; i++) {

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 1efbc0329f85a2a47ac19a5ff1c96bf3b5e86de2..94609f9c18eb32cb20ad6552f670fae875321730 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
@@ -986,7 +986,7 @@ static bool all_timings_support_vactive(const struct dml2_pmo_instance *pmo,
                const struct display_configuation_with_meta *display_config,
                unsigned int mask)
 {
-       unsigned char i;
+       unsigned int i;
        bool valid = true;
 
        // Create a remap array to enable simple iteration through only masked stream indicies
@@ -1035,7 +1035,7 @@ static bool all_timings_support_drr(const struct dml2_pmo_instance *pmo,
        const struct display_configuation_with_meta *display_config,
        unsigned int mask)
 {
-       unsigned char i;
+       unsigned int i;
        for (i = 0; i < DML2_MAX_PLANES; i++) {
                const struct dml2_stream_parameters *stream_descriptor;
                const struct dml2_fams2_meta *stream_fams2_meta;
@@ -1077,7 +1077,7 @@ static bool all_timings_support_svp(const struct dml2_pmo_instance *pmo,
        const struct dml2_plane_parameters *plane_descriptor;
        const struct dml2_fams2_meta *stream_fams2_meta;
        unsigned int microschedule_vlines;
-       unsigned char i;
+       unsigned int i;
 
        unsigned int num_planes_per_stream[DML2_MAX_PLANES] = { 0 };
 
@@ -1194,7 +1194,7 @@ static enum dml2_uclk_pstate_change_strategy pstate_method_to_uclk_pstate_strate
 
 static bool all_planes_match_method(const struct display_configuation_with_meta *display_cfg, int plane_mask, enum dml2_pstate_method method)
 {
-       unsigned char i;
+       unsigned int i;
 
        for (i = 0; i < DML2_MAX_PLANES; i++) {
                if (is_bit_set_in_bitfield(plane_mask, i)) {
@@ -1545,7 +1545,7 @@ static bool validate_pstate_support_strategy_cofunctionality(struct dml2_pmo_ins
 {
        struct dml2_pmo_scratch *s = &pmo->scratch;
 
-       unsigned char stream_index = 0;
+       unsigned int stream_index = 0;
 
        unsigned int svp_count = 0;
        unsigned int svp_stream_mask = 0;
@@ -1609,7 +1609,7 @@ static bool validate_pstate_support_strategy_cofunctionality(struct dml2_pmo_ins
 
 static int get_vactive_pstate_margin(const struct display_configuation_with_meta *display_cfg, int plane_mask)
 {
-       unsigned char i;
+       unsigned int i;
        int min_vactive_margin_us = 0xFFFFFFF;
 
        for (i = 0; i < DML2_MAX_PLANES; i++) {
@@ -1817,7 +1817,7 @@ bool pmo_dcn4_fams2_init_for_pstate_support(struct dml2_pmo_init_for_pstate_supp
        const struct dml2_pmo_pstate_strategy *strategy_list = NULL;
        struct dml2_pmo_pstate_strategy override_base_strategy = { 0 };
        unsigned int strategy_list_size = 0;
-       unsigned char plane_index, stream_index, i;
+       unsigned int plane_index, stream_index, i;
        bool build_override_strategy = true;
 
        state->performed = true;
@@ -1940,7 +1940,7 @@ static void setup_planes_for_drr_by_mask(struct display_configuation_with_meta *
        struct dml2_pmo_instance *pmo,
        int plane_mask)
 {
-       unsigned char plane_index;
+       unsigned int plane_index;
        struct dml2_plane_parameters *plane;
 
        for (plane_index = 0; plane_index < display_config->display_config.num_planes; plane_index++) {
@@ -1961,7 +1961,7 @@ static void setup_planes_for_svp_by_mask(struct display_configuation_with_meta *
 {
        struct dml2_pmo_scratch *scratch = &pmo->scratch;
 
-       unsigned char plane_index;
+       unsigned int plane_index;
        int stream_index = -1;
 
        for (plane_index = 0; plane_index < display_config->display_config.num_planes; plane_index++) {
@@ -1984,7 +1984,7 @@ static void setup_planes_for_svp_drr_by_mask(struct display_configuation_with_me
 {
        struct dml2_pmo_scratch *scratch = &pmo->scratch;
 
-       unsigned char plane_index;
+       unsigned int plane_index;
        int stream_index = -1;
 
        for (plane_index = 0; plane_index < display_config->display_config.num_planes; plane_index++) {
@@ -2005,7 +2005,7 @@ static void setup_planes_for_vblank_by_mask(struct display_configuation_with_met
        struct dml2_pmo_instance *pmo,
        int plane_mask)
 {
-       unsigned char plane_index;
+       unsigned int plane_index;
        struct dml2_plane_parameters *plane;
 
        for (plane_index = 0; plane_index < display_config->display_config.num_planes; plane_index++) {
@@ -2025,7 +2025,7 @@ static void setup_planes_for_vblank_drr_by_mask(struct display_configuation_with
        struct dml2_pmo_instance *pmo,
        int plane_mask)
 {
-       unsigned char plane_index;
+       unsigned int plane_index;
        struct dml2_plane_parameters *plane;
 
        for (plane_index = 0; plane_index < display_config->display_config.num_planes; plane_index++) {
@@ -2042,7 +2042,7 @@ static void setup_planes_for_vactive_by_mask(struct display_configuation_with_me
        struct dml2_pmo_instance *pmo,
        int plane_mask)
 {
-       unsigned char plane_index;
+       unsigned int plane_index;
        unsigned int stream_index;
 
        for (plane_index = 0; plane_index < display_config->display_config.num_planes; plane_index++) {
@@ -2063,7 +2063,7 @@ static void setup_planes_for_vactive_drr_by_mask(struct display_configuation_wit
        struct dml2_pmo_instance *pmo,
        int plane_mask)
 {
-       unsigned char plane_index;
+       unsigned int plane_index;
        unsigned int stream_index;
 
        for (plane_index = 0; plane_index < display_config->display_config.num_planes; plane_index++) {
@@ -2131,7 +2131,7 @@ static bool setup_display_config(struct display_configuation_with_meta *display_
 static int get_minimum_reserved_time_us_for_planes(struct display_configuation_with_meta *display_config, int plane_mask)
 {
        int min_time_us = 0xFFFFFF;
-       unsigned char plane_index = 0;
+       unsigned int plane_index = 0;
 
        for (plane_index = 0; plane_index < display_config->display_config.num_planes; plane_index++) {
                if (is_bit_set_in_bitfield(plane_mask, plane_index)) {