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: fix the race condition with wb output buffers"

Browse Source
This commit is contained in:
qctecmdr
2019-07-09 20:20:43 -07:00
committed by Gerrit - the friendly Code Review server
parent 84fc2163e1 d28cec1b1a
commit b37df49521
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
msm/sde/sde_encoder_phys_wb.c
View File

@@ -368,6 +368,7 @@ static void sde_encoder_phys_wb_setup_fb(struct sde_encoder_phys *phys_enc,
/* cache framebuffer for cleanup in writeback done */ /* cache framebuffer for cleanup in writeback done */
wb_enc->wb_fb = fb; wb_enc->wb_fb = fb;
wb_enc->wb_aspace = aspace; wb_enc->wb_aspace = aspace;
drm_framebuffer_get(fb);
format = msm_framebuffer_format(fb); format = msm_framebuffer_format(fb);
if (!format) { if (!format) {
@@ -1256,6 +1257,7 @@ static int _sde_encoder_phys_wb_wait_for_commit_done(
/* cleanup writeback framebuffer */ /* cleanup writeback framebuffer */
if (wb_enc->wb_fb && wb_enc->wb_aspace) { if (wb_enc->wb_fb && wb_enc->wb_aspace) {
msm_framebuffer_cleanup(wb_enc->wb_fb, wb_enc->wb_aspace); msm_framebuffer_cleanup(wb_enc->wb_fb, wb_enc->wb_aspace);
drm_framebuffer_put(wb_enc->wb_fb);
wb_enc->wb_fb = NULL; wb_enc->wb_fb = NULL;
wb_enc->wb_aspace = NULL; wb_enc->wb_aspace = NULL;
} }
@@ -1274,6 +1276,7 @@ skip_wait:
/* cleanup previous buffer if pending */ /* cleanup previous buffer if pending */
if (wb_enc->cwb_old_fb && wb_enc->cwb_old_aspace) { if (wb_enc->cwb_old_fb && wb_enc->cwb_old_aspace) {
msm_framebuffer_cleanup(wb_enc->cwb_old_fb, wb_enc->cwb_old_aspace); msm_framebuffer_cleanup(wb_enc->cwb_old_fb, wb_enc->cwb_old_aspace);
drm_framebuffer_put(wb_enc->cwb_old_fb);
wb_enc->cwb_old_fb = NULL; wb_enc->cwb_old_fb = NULL;
wb_enc->cwb_old_aspace = NULL; wb_enc->cwb_old_aspace = NULL;
} }