anierin/display-drivers
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "disp: msm: sde: avoid returning vsync count for cwb encoder"

Browse Source
This commit is contained in:
qctecmdr
2023-07-24 11:04:58 -07:00
committed by Gerrit - the friendly Code Review server
parent 6d21952dd2 4a5e3080f2
commit 185e0e7bf3
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
msm/sde/sde_encoder.c
View File

@@ -2777,6 +2777,7 @@ static void sde_encoder_virt_mode_set(struct drm_encoder *drm_enc,
sde_crtc_state->cached_cwb_enc_mask);
sde_crtc_state->cwb_enc_mask = sde_crtc_state->cached_cwb_enc_mask;
sde_encoder_set_clone_mode(drm_enc, crtc_state);
sde_crtc->cached_encoder_mask |= drm_encoder_mask(drm_enc);
}
/* reserve dynamic resources now, indicating non test-only */

6
msm/sde/sde_encoder_phys_wb.c
View File

@@ -1927,7 +1927,9 @@ static bool _sde_encoder_phys_wb_is_idle(struct sde_encoder_phys *phys_enc)
static void _sde_encoder_phys_wb_reset_state(struct sde_encoder_phys *phys_enc)
{
struct sde_encoder_phys_wb *wb_enc = to_sde_encoder_phys_wb(phys_enc);
struct sde_encoder_virt *sde_enc = to_sde_encoder_virt(phys_enc->parent);
struct sde_wb_device *wb_dev = wb_enc->wb_dev;
struct sde_crtc *sde_crtc;
phys_enc->enable_state = SDE_ENC_DISABLED;
@@ -1939,6 +1941,10 @@ static void _sde_encoder_phys_wb_reset_state(struct sde_encoder_phys *phys_enc)
wb_enc->wb_aspace = NULL;
}
sde_crtc = to_sde_crtc(sde_enc->crtc);
if (sde_crtc)
sde_crtc->cached_encoder_mask &= ~drm_encoder_mask(phys_enc->parent);
wb_enc->crtc = NULL;
phys_enc->hw_cdm = NULL;
phys_enc->hw_ctl = NULL;