There is no reason to use the more specific u8 type for slice count
variables, use the more generic int type instead.

Signed-off-by: Imre Deak <[email protected]>
---
 drivers/gpu/drm/i915/display/intel_dp.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c 
b/drivers/gpu/drm/i915/display/intel_dp.c
index 79b87bc041a75..1d9a130bd4060 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -962,7 +962,7 @@ static int intel_dp_dsc_min_slice_count(const struct 
intel_connector *connector,
                                        int mode_clock, int mode_hdisplay)
 {
        struct intel_display *display = to_intel_display(connector);
-       u8 min_slice_count;
+       int min_slice_count;
        int max_slice_width;
        int tp_rgb_yuv444;
        int tp_yuv422_420;
@@ -1007,7 +1007,7 @@ static int intel_dp_dsc_min_slice_count(const struct 
intel_connector *connector,
         * slice and VDSC engine, whenever we approach close enough to max CDCLK
         */
        if (mode_clock >= ((display->cdclk.max_cdclk_freq * 85) / 100))
-               min_slice_count = max_t(u8, min_slice_count, 2);
+               min_slice_count = max(min_slice_count, 2);
 
        max_slice_width = 
drm_dp_dsc_sink_max_slice_width(connector->dp.dsc_dpcd);
        if (max_slice_width < DP_DSC_MIN_SLICE_WIDTH_VALUE) {
@@ -1017,9 +1017,8 @@ static int intel_dp_dsc_min_slice_count(const struct 
intel_connector *connector,
                return 0;
        }
        /* Also take into account max slice width */
-       min_slice_count = max_t(u8, min_slice_count,
-                               DIV_ROUND_UP(mode_hdisplay,
-                                            max_slice_width));
+       min_slice_count = max(min_slice_count,
+                             DIV_ROUND_UP(mode_hdisplay, max_slice_width));
 
        return min_slice_count;
 }
@@ -1037,7 +1036,7 @@ u8 intel_dp_dsc_get_slice_count(const struct 
intel_connector *connector,
 
        /* Find the closest match to the valid slice count values */
        for (i = 0; i < ARRAY_SIZE(valid_dsc_slicecount); i++) {
-               u8 test_slice_count = valid_dsc_slicecount[i] * 
num_joined_pipes;
+               int test_slice_count = valid_dsc_slicecount[i] * 
num_joined_pipes;
 
                /*
                 * 3 DSC Slices per pipe need 3 DSC engines, which is supported 
only
-- 
2.49.1

Reply via email to