mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-11 07:03:09 -04:00
Merge "disp: msm: sde: fix the race condition with wb output buffers"
This commit is contained in:
commit
b37df49521
1 changed files with 3 additions and 0 deletions
|
|
@ -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 */
|
||||
wb_enc->wb_fb = fb;
|
||||
wb_enc->wb_aspace = aspace;
|
||||
drm_framebuffer_get(fb);
|
||||
|
||||
format = msm_framebuffer_format(fb);
|
||||
if (!format) {
|
||||
|
|
@ -1256,6 +1257,7 @@ static int _sde_encoder_phys_wb_wait_for_commit_done(
|
|||
/* cleanup writeback framebuffer */
|
||||
if (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_aspace = NULL;
|
||||
}
|
||||
|
|
@ -1274,6 +1276,7 @@ skip_wait:
|
|||
/* cleanup previous buffer if pending */
|
||||
if (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_aspace = NULL;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue