Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sna: Prefer first active CRTC for offscreen drawables 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2015-02-10 13:50:31 +00:00
parent d50eb8d57a
commit d1ebd27a31
3 changed files with 4 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/sna/sna.h
View File

@ -506,7 +506,6 @@ extern xf86CrtcPtr sna_covering_crtc(struct sna *sna,
const BoxRec *box,
xf86CrtcPtr desired);
extern xf86CrtcPtr sna_primary_crtc(struct sna *sna);
extern xf86CrtcPtr sna_first_active_crtc(struct sna *sna);
extern bool sna_wait_for_scanline(struct sna *sna, PixmapPtr pixmap,
xf86CrtcPtr crtc, const BoxRec *clip);

46
src/sna/sna_display.c
View File

@ -6159,8 +6159,8 @@ xf86CrtcPtr
sna_covering_crtc(struct sna *sna, const BoxRec *box, xf86CrtcPtr desired)
{
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(sna->scrn);
xf86CrtcPtr best_crtc;
int best_coverage, c;
xf86CrtcPtr best_crtc = NULL;
int best_coverage = -1, c;
if (sna->flags & SNA_IS_HOSTED)
return NULL;
@ -6196,10 +6196,10 @@ sna_covering_crtc(struct sna *sna, const BoxRec *box, xf86CrtcPtr desired)
cover_box.x2, cover_box.y2));
return desired;
}
best_crtc = desired;
best_coverage = 0;
}
best_crtc = NULL;
best_coverage = 0;
for (c = 0; c < sna->mode.num_real_crtc; c++) {
xf86CrtcPtr crtc = config->crtc[c];
BoxRec cover_box;
@ -6245,44 +6245,6 @@ sna_covering_crtc(struct sna *sna, const BoxRec *box, xf86CrtcPtr desired)
return best_crtc;
}
xf86CrtcPtr sna_first_active_crtc(struct sna *sna)
{
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(sna->scrn);
rrScrPrivPtr rr;
int c;
if (sna->flags & SNA_IS_HOSTED)
return NULL;
/* If we do not own the VT, we do not own the CRTC either */
if (!sna->scrn->vtSema) {
DBG(("%s: none, VT switched\n", __FUNCTION__));
return NULL;
}
if (sna->mode.hidden) {
DBG(("%s: none, hidden outputs\n", __FUNCTION__));
return NULL;
}
rr = rrGetScrPriv(xf86ScrnToScreen(sna->scrn));
if (rr && rr->primaryOutput) {
xf86OutputPtr output = rr->primaryOutput->devPrivate;
xf86CrtcPtr crtc = output->crtc;
if (crtc && to_sna_crtc(crtc) && to_sna_crtc(crtc)->bo)
return crtc;
}
for (c = 0; c < sna->mode.num_real_crtc; c++) {
if (to_sna_crtc(config->crtc[c])->bo == NULL)
continue;
return config->crtc[c];
}
return NULL;
}
xf86CrtcPtr sna_primary_crtc(struct sna *sna)
{
rrScrPrivPtr rr = rrGetScrPriv(xf86ScrnToScreen(sna->scrn));

10
src/sna/sna_present.c
View File

@ -95,16 +95,6 @@ sna_present_get_crtc(WindowPtr window)
if (crtc)
return crtc->randr_crtc;
/* Offscreen Window - use any CRTC as a clocksource.
* This is likely to be either a Window on either VIRTUAL or PRIME
* screen real estate, and ideally we would delegate to the
* slave CRTC, but using our hardware is preferable to falling back
* to Present's timer implemetation.
*/
crtc = sna_first_active_crtc(sna);
if (crtc)
return crtc->randr_crtc;
return NULL;
}