1*4882a593SmuzhiyunFrom bc6a57aedf9d7446585bb0d76530c611a9622afb Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Jeffy Chen <jeffy.chen@rock-chips.com> 3*4882a593SmuzhiyunDate: Wed, 6 Jan 2021 10:13:40 +0800 4*4882a593SmuzhiyunSubject: [PATCH 41/93] backend-drm: Fix disabling output error when using 5*4882a593Smuzhiyun atomic 6*4882a593Smuzhiyun 7*4882a593SmuzhiyunDisabling output in async mode is not allow by drm driver's 8*4882a593Smuzhiyundrm_atomic_crtc_check() for "requesting event but off" error. 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunSigned-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> 11*4882a593Smuzhiyun--- 12*4882a593Smuzhiyun libweston/backend-drm/kms.c | 10 ++++++++-- 13*4882a593Smuzhiyun 1 file changed, 8 insertions(+), 2 deletions(-) 14*4882a593Smuzhiyun 15*4882a593Smuzhiyundiff --git a/libweston/backend-drm/kms.c b/libweston/backend-drm/kms.c 16*4882a593Smuzhiyunindex 61dadef..3d97df2 100644 17*4882a593Smuzhiyun--- a/libweston/backend-drm/kms.c 18*4882a593Smuzhiyun+++ b/libweston/backend-drm/kms.c 19*4882a593Smuzhiyun@@ -1167,6 +1167,14 @@ drm_pending_state_apply_atomic(struct drm_pending_state *pending_state, 20*4882a593Smuzhiyun if (!req) 21*4882a593Smuzhiyun return -1; 22*4882a593Smuzhiyun 23*4882a593Smuzhiyun+ wl_list_for_each(output_state, &pending_state->output_list, link) { 24*4882a593Smuzhiyun+ if (output_state->output->virtual) 25*4882a593Smuzhiyun+ continue; 26*4882a593Smuzhiyun+ if (output_state->dpms == WESTON_DPMS_OFF && 27*4882a593Smuzhiyun+ mode == DRM_STATE_APPLY_ASYNC) 28*4882a593Smuzhiyun+ mode = DRM_STATE_APPLY_SYNC; 29*4882a593Smuzhiyun+ } 30*4882a593Smuzhiyun+ 31*4882a593Smuzhiyun switch (mode) { 32*4882a593Smuzhiyun case DRM_STATE_APPLY_SYNC: 33*4882a593Smuzhiyun flags = 0; 34*4882a593Smuzhiyun@@ -1269,8 +1277,6 @@ drm_pending_state_apply_atomic(struct drm_pending_state *pending_state, 35*4882a593Smuzhiyun wl_list_for_each(output_state, &pending_state->output_list, link) { 36*4882a593Smuzhiyun if (output_state->output->virtual) 37*4882a593Smuzhiyun continue; 38*4882a593Smuzhiyun- if (mode == DRM_STATE_APPLY_SYNC) 39*4882a593Smuzhiyun- assert(output_state->dpms == WESTON_DPMS_OFF); 40*4882a593Smuzhiyun ret |= drm_output_apply_state_atomic(output_state, req, &flags); 41*4882a593Smuzhiyun } 42*4882a593Smuzhiyun 43*4882a593Smuzhiyun-- 44*4882a593Smuzhiyun2.20.1 45*4882a593Smuzhiyun 46