]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/amd/display: Make sure line size is not zero in DCN2 line buffer size calculations
authorNikola Cornij <nikola.cornij@amd.com>
Mon, 15 Apr 2019 18:32:28 +0000 (14:32 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Sat, 22 Jun 2019 14:34:11 +0000 (09:34 -0500)
[why]
'Divide by zero' error happens when line size happens to be zero.

[how]
The code that makes sure line size minimum value can be 1 was already
present in DCN1 part of the driver, this is mearly a port to DCN2.

Signed-off-by: Nikola Cornij <nikola.cornij@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.c

index b706190e16c127ed967148d90056a5499b51c76e..9bc5dd23d297e1f27ea0e00987da094e71b96c02 100644 (file)
@@ -251,14 +251,23 @@ void dscl2_calc_lb_num_partitions(
                int *num_part_y,
                int *num_part_c)
 {
+       int memory_line_size_y, memory_line_size_c, memory_line_size_a,
+       lb_memory_size, lb_memory_size_c, lb_memory_size_a, num_partitions_a;
+
        int line_size = scl_data->viewport.width < scl_data->recout.width ?
                        scl_data->viewport.width : scl_data->recout.width;
        int line_size_c = scl_data->viewport_c.width < scl_data->recout.width ?
                        scl_data->viewport_c.width : scl_data->recout.width;
-       int memory_line_size_y = (line_size + 5) / 6; /* +5 to ceil */
-       int memory_line_size_c = (line_size_c + 5) / 6; /* +5 to ceil */
-       int memory_line_size_a = (line_size + 5) / 6; /* +5 to ceil */
-       int lb_memory_size, lb_memory_size_c, lb_memory_size_a, num_partitions_a;
+
+       if (line_size == 0)
+               line_size = 1;
+
+       if (line_size_c == 0)
+               line_size_c = 1;
+
+       memory_line_size_y = (line_size + 5) / 6; /* +5 to ceil */
+       memory_line_size_c = (line_size_c + 5) / 6; /* +5 to ceil */
+       memory_line_size_a = (line_size + 5) / 6; /* +5 to ceil */
 
        if (lb_config == LB_MEMORY_CONFIG_1) {
                lb_memory_size = 970;