1*4882a593SmuzhiyunFrom 0dab8adb878bd5c1d7d1c103cae4e3d546ed2fc1 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Jeffy Chen <jeffy.chen@rock-chips.com> 3*4882a593SmuzhiyunDate: Thu, 2 Jul 2020 14:58:49 +0800 4*4882a593SmuzhiyunSubject: [PATCH 07/93] HACK: backend-drm: Avoid random crash when suspending 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunSkip the repaint_status check since the weston_output_finish_frame() 7*4882a593Smuzhiyuncould also be called when turning off dpms. 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunSigned-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> 10*4882a593Smuzhiyun--- 11*4882a593Smuzhiyun libweston/backend-drm/drm.c | 6 ++++-- 12*4882a593Smuzhiyun libweston/compositor.c | 2 -- 13*4882a593Smuzhiyun 2 files changed, 4 insertions(+), 4 deletions(-) 14*4882a593Smuzhiyun 15*4882a593Smuzhiyundiff --git a/libweston/backend-drm/drm.c b/libweston/backend-drm/drm.c 16*4882a593Smuzhiyunindex c783f5d..448f763 100644 17*4882a593Smuzhiyun--- a/libweston/backend-drm/drm.c 18*4882a593Smuzhiyun+++ b/libweston/backend-drm/drm.c 19*4882a593Smuzhiyun@@ -287,8 +287,10 @@ drm_output_update_complete(struct drm_output *output, uint32_t flags, 20*4882a593Smuzhiyun wl_list_for_each(ps, &output->state_cur->plane_list, link) 21*4882a593Smuzhiyun ps->complete = true; 22*4882a593Smuzhiyun 23*4882a593Smuzhiyun- drm_output_state_free(output->state_last); 24*4882a593Smuzhiyun- output->state_last = NULL; 25*4882a593Smuzhiyun+ if (output->state_last) { 26*4882a593Smuzhiyun+ drm_output_state_free(output->state_last); 27*4882a593Smuzhiyun+ output->state_last = NULL; 28*4882a593Smuzhiyun+ } 29*4882a593Smuzhiyun 30*4882a593Smuzhiyun if (output->destroy_pending) { 31*4882a593Smuzhiyun output->destroy_pending = false; 32*4882a593Smuzhiyundiff --git a/libweston/compositor.c b/libweston/compositor.c 33*4882a593Smuzhiyunindex 7b15769..e166911 100644 34*4882a593Smuzhiyun--- a/libweston/compositor.c 35*4882a593Smuzhiyun+++ b/libweston/compositor.c 36*4882a593Smuzhiyun@@ -3515,8 +3515,6 @@ weston_output_finish_frame(struct weston_output *output, 37*4882a593Smuzhiyun struct timespec vblank_monotonic; 38*4882a593Smuzhiyun int64_t msec_rel; 39*4882a593Smuzhiyun 40*4882a593Smuzhiyun- assert(output->repaint_status == REPAINT_AWAITING_COMPLETION); 41*4882a593Smuzhiyun- 42*4882a593Smuzhiyun /* 43*4882a593Smuzhiyun * If timestamp of latest vblank is given, it must always go forwards. 44*4882a593Smuzhiyun * If not given, INVALID flag must be set. 45*4882a593Smuzhiyun-- 46*4882a593Smuzhiyun2.20.1 47*4882a593Smuzhiyun 48