fix-stutter

Author: henkwiedig

src/main.cpp

@@ -285,17 +285,17 @@ void *__DISPLAY_THREAD__(void *param)
 		assert(!ret);
 
 		// show DRM FB in plane
-		ret = pthread_mutex_lock(&osd_mutex);
-		assert(!ret);		
 		drmModeAtomicSetCursor(output_list->video_request, 0);
 		ret = set_drm_object_property(output_list->video_request, &output_list->video_plane, "FB_ID", fb_id);
 		assert(ret>0);
 
 		if(enable_osd) {
+			ret = pthread_mutex_lock(&osd_mutex);
+			assert(!ret);		
 			ret = set_drm_object_property(output_list->video_request, &output_list->osd_plane, "FB_ID", output_list->osd_bufs[output_list->osd_buf_switch].fb);
 			assert(ret>0);
 		}
-		drmModeAtomicCommit(drm_fd, output_list->video_request, DRM_MODE_ATOMIC_NONBLOCK, NULL);
+		drmModeAtomicCommit(drm_fd, output_list->video_request, DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
 		ret = pthread_mutex_unlock(&osd_mutex);
 		assert(!ret);
 

src/osd.cpp

@@ -1615,9 +1615,6 @@ void *__OSD_THREAD__(void *param) {
 			int ret = pthread_mutex_lock(&osd_mutex);
 			assert(!ret);	
 			p->out->osd_buf_switch = buf_idx;
-			ret = set_drm_object_property(p->out->video_request, &p->out->osd_plane, "FB_ID", p->out->osd_bufs[p->out->osd_buf_switch].fb);
-			assert(ret>0);
-			drmModeAtomicCommit(p->fd, p->out->video_request, DRM_MODE_ATOMIC_NONBLOCK, NULL);				
 			ret = pthread_mutex_unlock(&osd_mutex);
 			assert(!ret);
 			last_display_at = std::chrono::steady_clock::now();