]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
drm/amd/display: fix potential infinite loop in fbc path
authorRoman Li <Roman.Li@amd.com>
Tue, 5 Jun 2018 18:24:53 +0000 (14:24 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 5 Jul 2018 21:38:39 +0000 (16:38 -0500)
- Fixing integer overflow bug in wait_for_fbc_state_changed()
- Correct the max value of retries for the corresponding warning

Signed-off-by: Roman Li <Roman.Li@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/dce110/dce110_compressor.c

index df027013e50c4dc8452706bf219bb0298678ecbf..1f7f25013217dfad9226ed55a98aee0461b500a0 100644 (file)
@@ -143,7 +143,7 @@ static void wait_for_fbc_state_changed(
        struct dce110_compressor *cp110,
        bool enabled)
 {
-       uint16_t counter = 0;
+       uint32_t counter = 0;
        uint32_t addr = mmFBC_STATUS;
        uint32_t value;
 
@@ -158,7 +158,7 @@ static void wait_for_fbc_state_changed(
                counter++;
        }
 
-       if (counter == 10) {
+       if (counter == 1000) {
                DC_LOG_WARNING("%s: wait counter exceeded, changes to HW not applied",
                        __func__);
        } else {