dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ecore_drm: Check for currently used CRTC first before searching others 

If we have a CRTC already configured save the work to search for a new
crtc and encoder combination that works with this connector. Just use what
we have.

Also always check if the CRTC is already allocated for a different connection
before using it.
This commit is contained in:
Stefan Schmidt 2014-07-01 15:01:38 +02:00
parent 64d54ed964
commit a7428edeb4
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/lib/ecore_drm/ecore_drm_output.c
View File

@ -201,31 +201,52 @@ _ecore_drm_output_software_render(Ecore_Drm_Output *output)
if (!output->current_mode) return; if (!output->current_mode) return;
} }
static int static int
_ecore_drm_output_crtc_find(Ecore_Drm_Device *dev, drmModeRes *res, drmModeConnector *conn) _ecore_drm_output_crtc_find(Ecore_Drm_Device *dev, drmModeRes *res, drmModeConnector *conn)
{ {
drmModeEncoder *enc; drmModeEncoder *enc;
unsigned int p; unsigned int p;
int i = 0, j = 0; int i, j;
int crtc = -1;
/* Trying to first use the currently active encoder and crtc combination to avoid a
* full modeset */
if (conn->encoder_id)
enc = drmModeGetEncoder(dev->drm.fd, conn->encoder_id);
else
enc = NULL;
if (enc && enc->crtc_id)
{
crtc = enc->crtc_id;
drmModeFreeEncoder(enc);
/* Check is this CRTC is already allocated */
if (!(dev->crtc_allocator & (1 << crtc)))
return crtc;
}
/* We did not find an existing encoder + crtc combination. Loop through all of them until we
* find the first working combination */
for (j = 0; j < conn->count_encoders; j++) for (j = 0; j < conn->count_encoders; j++)
{ {
/* get the encoder on this connector */ /* get the encoder on this connector */
if (!(enc = drmModeGetEncoder(dev->drm.fd, conn->encoders[j]))) if (!(enc = drmModeGetEncoder(dev->drm.fd, conn->encoders[j])))
{ {
ERR("Failed to get encoder: %m"); WRN("Failed to get encoder: %m");
return -1; continue;
} }
p = enc->possible_crtcs; p = enc->possible_crtcs;
drmModeFreeEncoder(enc); drmModeFreeEncoder(enc);
/* Walk over all CRTCs */
for (i = 0; i < res->count_crtcs; i++) for (i = 0; i < res->count_crtcs; i++)
{ {
if ((p & (1 << i)) && /* Does the CRTC match the list of possible CRTCs from the encoder? */
if ((p & (1 << i)) &&
(!(dev->crtc_allocator & (1 << res->crtcs[i])))) (!(dev->crtc_allocator & (1 << res->crtcs[i]))))
{ {
return i; return res->crtcs[i];
} }
} }
} }