1*4882a593SmuzhiyunFrom 5f484c213e6a508c4b602315f73eb206748caa1d Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Jeffy Chen <jeffy.chen@rock-chips.com> 3*4882a593SmuzhiyunDate: Fri, 1 Jul 2022 19:20:48 +0800 4*4882a593SmuzhiyunSubject: [PATCH 06/10] ecore_drm2: Fallback to first possible CRTC of encoder 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunTODO: Avoid using assigned CRTC. 7*4882a593Smuzhiyun 8*4882a593SmuzhiyunSigned-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> 9*4882a593Smuzhiyun--- 10*4882a593Smuzhiyun src/lib/ecore_drm2/ecore_drm2_outputs.c | 12 ++++++++---- 11*4882a593Smuzhiyun 1 file changed, 8 insertions(+), 4 deletions(-) 12*4882a593Smuzhiyun 13*4882a593Smuzhiyundiff --git a/src/lib/ecore_drm2/ecore_drm2_outputs.c b/src/lib/ecore_drm2/ecore_drm2_outputs.c 14*4882a593Smuzhiyunindex 77123c9..d7ff6a2 100644 15*4882a593Smuzhiyun--- a/src/lib/ecore_drm2/ecore_drm2_outputs.c 16*4882a593Smuzhiyun+++ b/src/lib/ecore_drm2/ecore_drm2_outputs.c 17*4882a593Smuzhiyun@@ -253,7 +253,7 @@ static int 18*4882a593Smuzhiyun _output_crtc_find(const drmModeRes *res, const drmModeConnector *conn, int fd) 19*4882a593Smuzhiyun { 20*4882a593Smuzhiyun drmModeEncoder *enc; 21*4882a593Smuzhiyun- uint32_t crtc; 22*4882a593Smuzhiyun+ uint32_t crtc, possible_crtcs; 23*4882a593Smuzhiyun int i = 0, j = 0; 24*4882a593Smuzhiyun 25*4882a593Smuzhiyun /* Skip all disconnected connectors... 26*4882a593Smuzhiyun@@ -271,8 +271,12 @@ _output_crtc_find(const drmModeRes *res, const drmModeConnector *conn, int fd) 27*4882a593Smuzhiyun if (!enc) continue; 28*4882a593Smuzhiyun 29*4882a593Smuzhiyun crtc = enc->crtc_id; 30*4882a593Smuzhiyun+ possible_crtcs = enc->possible_crtcs; 31*4882a593Smuzhiyun sym_drmModeFreeEncoder(enc); 32*4882a593Smuzhiyun 33*4882a593Smuzhiyun+ if (!crtc) 34*4882a593Smuzhiyun+ return ffs(possible_crtcs) - 1; 35*4882a593Smuzhiyun+ 36*4882a593Smuzhiyun for (i = 0; i < res->count_crtcs; i++) 37*4882a593Smuzhiyun if (crtc == res->crtcs[i]) 38*4882a593Smuzhiyun return i; 39*4882a593Smuzhiyun@@ -1433,6 +1437,9 @@ ecore_drm2_output_possible_crtc_get(Ecore_Drm2_Output *output, unsigned int crtc 40*4882a593Smuzhiyun EINA_SAFETY_ON_NULL_RETURN_VAL(output, EINA_FALSE); 41*4882a593Smuzhiyun EINA_SAFETY_ON_TRUE_RETURN_VAL((output->fd < 0), EINA_FALSE); 42*4882a593Smuzhiyun 43*4882a593Smuzhiyun+ if (output->crtc_id != crtc) 44*4882a593Smuzhiyun+ return EINA_FALSE; 45*4882a593Smuzhiyun+ 46*4882a593Smuzhiyun res = sym_drmModeGetResources(output->fd); 47*4882a593Smuzhiyun if (!res) return EINA_FALSE; 48*4882a593Smuzhiyun 49*4882a593Smuzhiyun@@ -1446,8 +1453,6 @@ ecore_drm2_output_possible_crtc_get(Ecore_Drm2_Output *output, unsigned int crtc 50*4882a593Smuzhiyun enc = sym_drmModeGetEncoder(output->fd, conn->encoders[j]); 51*4882a593Smuzhiyun if (!enc) continue; 52*4882a593Smuzhiyun 53*4882a593Smuzhiyun- if (enc->crtc_id != crtc) goto next; 54*4882a593Smuzhiyun- 55*4882a593Smuzhiyun p = enc->possible_crtcs; 56*4882a593Smuzhiyun 57*4882a593Smuzhiyun for (k = 0; k < res->count_crtcs; k++) 58*4882a593Smuzhiyun@@ -1461,7 +1466,6 @@ ecore_drm2_output_possible_crtc_get(Ecore_Drm2_Output *output, unsigned int crtc 59*4882a593Smuzhiyun } 60*4882a593Smuzhiyun } 61*4882a593Smuzhiyun 62*4882a593Smuzhiyun-next: 63*4882a593Smuzhiyun sym_drmModeFreeEncoder(enc); 64*4882a593Smuzhiyun if (ret) break; 65*4882a593Smuzhiyun } 66*4882a593Smuzhiyun-- 67*4882a593Smuzhiyun2.20.1 68*4882a593Smuzhiyun 69