samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Forkuj 0
Kod Zgłoszenia Oczekujące zmiany Actions Packages Projekty Wydania Wiki Aktywność

Merge "Revert "disp: msm: sde: avoid race on in_clone_mode flag in wb encoder""

Przeglądaj źródła
This commit is contained in:
qctecmdr
2024-03-20 21:49:27 -07:00
zatwierdzone przez Gerrit - the friendly Code Review server
rodzic 1088452eaf 2122339163
commit 5c7dda5c20
1 zmienionych plików z 1 dodań i 8 usunięć
Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

9
msm/sde/sde_encoder_phys_wb.c
Wyświetl plik

@@ -1865,13 +1865,11 @@ static void _sde_encoder_phys_wb_frame_done_helper(void *arg, bool frame_error)
struct sde_encoder_phys *phys_enc = &wb_enc->base; struct sde_encoder_phys *phys_enc = &wb_enc->base;
u32 event = frame_error ? SDE_ENCODER_FRAME_EVENT_ERROR : 0; u32 event = frame_error ? SDE_ENCODER_FRAME_EVENT_ERROR : 0;
u32 ubwc_error = 0; u32 ubwc_error = 0;
unsigned long flags;
/* don't notify upper layer for internal commit */ /* don't notify upper layer for internal commit */
if (phys_enc->enable_state == SDE_ENC_DISABLING && !phys_enc->in_clone_mode) if (phys_enc->enable_state == SDE_ENC_DISABLING && !phys_enc->in_clone_mode)
goto end; goto end;
spin_lock_irqsave(phys_enc->enc_spinlock, flags);
if (phys_enc->parent_ops.handle_frame_done && if (phys_enc->parent_ops.handle_frame_done &&
atomic_add_unless(&phys_enc->pending_kickoff_cnt, -1, 0)) { atomic_add_unless(&phys_enc->pending_kickoff_cnt, -1, 0)) {
event |= SDE_ENCODER_FRAME_EVENT_DONE; event |= SDE_ENCODER_FRAME_EVENT_DONE;
@@ -1893,11 +1891,9 @@ static void _sde_encoder_phys_wb_frame_done_helper(void *arg, bool frame_error)
| SDE_ENCODER_FRAME_EVENT_SIGNAL_RETIRE_FENCE; | SDE_ENCODER_FRAME_EVENT_SIGNAL_RETIRE_FENCE;
else else
event |= SDE_ENCODER_FRAME_EVENT_SIGNAL_RELEASE_FENCE; event |= SDE_ENCODER_FRAME_EVENT_SIGNAL_RELEASE_FENCE;
}
spin_unlock_irqrestore(phys_enc->enc_spinlock, flags);
if (event & SDE_ENCODER_FRAME_EVENT_DONE)
phys_enc->parent_ops.handle_frame_done(phys_enc->parent, phys_enc, event); phys_enc->parent_ops.handle_frame_done(phys_enc->parent, phys_enc, event);
}
if (!phys_enc->in_clone_mode && phys_enc->parent_ops.handle_vblank_virt) if (!phys_enc->in_clone_mode && phys_enc->parent_ops.handle_vblank_virt)
phys_enc->parent_ops.handle_vblank_virt(phys_enc->parent, phys_enc); phys_enc->parent_ops.handle_vblank_virt(phys_enc->parent, phys_enc);
@@ -2310,15 +2306,12 @@ end:
static int sde_encoder_phys_wb_wait_for_tx_complete(struct sde_encoder_phys *phys_enc) static int sde_encoder_phys_wb_wait_for_tx_complete(struct sde_encoder_phys *phys_enc)
{ {
int rc = 0; int rc = 0;
unsigned long flags;
if (atomic_read(&phys_enc->pending_kickoff_cnt)) if (atomic_read(&phys_enc->pending_kickoff_cnt))
rc = _sde_encoder_phys_wb_wait_for_idle(phys_enc, true); rc = _sde_encoder_phys_wb_wait_for_idle(phys_enc, true);
if ((phys_enc->enable_state == SDE_ENC_DISABLING) && phys_enc->in_clone_mode) { if ((phys_enc->enable_state == SDE_ENC_DISABLING) && phys_enc->in_clone_mode) {
spin_lock_irqsave(phys_enc->enc_spinlock, flags);
_sde_encoder_phys_wb_reset_state(phys_enc); _sde_encoder_phys_wb_reset_state(phys_enc);
spin_unlock_irqrestore(phys_enc->enc_spinlock, flags);
sde_encoder_phys_wb_irq_ctrl(phys_enc, false); sde_encoder_phys_wb_irq_ctrl(phys_enc, false);
} }