samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "disp: msm: sde: update encoder wait event timeout condition" into display-kernel.lnx.5.15

Browse Source
This commit is contained in:
Linux Build Service Account
2022-07-17 12:55:31 -07:00
committed by Gerrit - the friendly Code Review server
parent 4ba5377d5f a5e9316dd1
commit b08fbb8ed4
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
msm/sde/sde_encoder.c
View File

@@ -352,6 +352,7 @@ static int _sde_encoder_wait_timeout(int32_t drm_id, int32_t hw_id,
s64 wait_time_jiffies = msecs_to_jiffies(timeout_ms); s64 wait_time_jiffies = msecs_to_jiffies(timeout_ms);
ktime_t cur_ktime; ktime_t cur_ktime;
ktime_t exp_ktime = ktime_add_ms(ktime_get(), timeout_ms); ktime_t exp_ktime = ktime_add_ms(ktime_get(), timeout_ms);
u32 curr_atomic_cnt = atomic_read(info->atomic_cnt);
do { do {
rc = wait_event_timeout(*(info->wq), rc = wait_event_timeout(*(info->wq),
@@ -362,6 +363,14 @@ static int _sde_encoder_wait_timeout(int32_t drm_id, int32_t hw_id,
SDE_EVT32(drm_id, hw_id, rc, ktime_to_ms(cur_ktime), SDE_EVT32(drm_id, hw_id, rc, ktime_to_ms(cur_ktime),
timeout_ms, atomic_read(info->atomic_cnt), timeout_ms, atomic_read(info->atomic_cnt),
info->count_check); info->count_check);
/* Make an early exit if the condition is already satisfied */
if ((atomic_read(info->atomic_cnt) < info->count_check) &&
(info->count_check < curr_atomic_cnt)) {
rc = true;
break;
}
/* If we timed out, counter is valid and time is less, wait again */ /* If we timed out, counter is valid and time is less, wait again */
} while ((atomic_read(info->atomic_cnt) != info->count_check) && } while ((atomic_read(info->atomic_cnt) != info->count_check) &&
(rc == 0) && (rc == 0) &&