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

sna: Validate all CRTCs after updating one 

Updating one CRTC may cause the kernel to turn off another, so be
paranoid and run the check in a loop after applying the CRTC set.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2012-05-27 16:46:42 +01:00
parent 7fdd8bd6d2
commit 36d53ff52b
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sna/sna.h
View File

@ -295,7 +295,7 @@ struct sna {
Bool sna_mode_pre_init(ScrnInfoPtr scrn, struct sna *sna);
extern void sna_mode_remove_fb(struct sna *sna);
extern void sna_mode_hotplug(struct sna *sna);
extern void sna_mode_update(struct sna *sna);
extern void sna_mode_fini(struct sna *sna);
extern int sna_crtc_id(xf86CrtcPtr crtc);

20
src/sna/sna_display.c
View File

@ -397,8 +397,8 @@ bool sna_crtc_is_bound(struct sna *sna, xf86CrtcPtr crtc)
if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETCRTC, &mode))
return false;
DBG(("%s: mode valid?=%d, fb attached?=%d\n", __FUNCTION__,
mode.mode_valid, sna->mode.fb_id == mode.fb_id));
DBG(("%s: crtc=%d, mode valid?=%d, fb attached?=%d\n", __FUNCTION__,
mode.crtc_id, mode.mode_valid, sna->mode.fb_id == mode.fb_id));
return mode.mode_valid && sna->mode.fb_id == mode.fb_id;
}
@ -469,10 +469,8 @@ sna_crtc_apply(xf86CrtcPtr crtc)
xf86DrvMsg(crtc->scrn->scrnIndex, X_ERROR,
"failed to set mode: %s\n", strerror(-ret));
ret = FALSE;
} else {
sna_crtc->active = sna_crtc_is_bound(sna, crtc);
} else
ret = TRUE;
}
if (crtc->scrn->pScreen)
xf86_reload_cursors(crtc->scrn->pScreen);
@ -520,6 +518,7 @@ sna_crtc_restore(struct sna *sna)
if (crtc->enabled)
sna_crtc_apply(crtc);
}
sna_mode_update(sna);
kgem_bo_retire(&sna->kgem, bo);
scrn->displayWidth = bo->pitch / sna->mode.cpp;
@ -742,6 +741,7 @@ sna_crtc_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
crtc->mode = saved_mode;
return FALSE;
}
sna_mode_update(sna);
update_flush_interval(sna);
return TRUE;
@ -1765,6 +1765,7 @@ sna_crtc_resize(ScrnInfoPtr scrn, int width, int height)
if (!sna_crtc_apply(crtc))
goto fail;
}
sna_mode_update(sna);
kgem_bo_retire(&sna->kgem, bo);
@ -2243,7 +2244,7 @@ sna_wait_for_scanline(struct sna *sna,
return true;
}
void sna_mode_hotplug(struct sna *sna)
void sna_mode_update(struct sna *sna)
{
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(sna->scrn);
int i;
@ -2251,9 +2252,10 @@ void sna_mode_hotplug(struct sna *sna)
/* Validate CRTC attachments */
for (i = 0; i < xf86_config->num_crtc; i++) {
xf86CrtcPtr crtc = xf86_config->crtc[i];
if (crtc->enabled) {
struct sna_crtc *sna_crtc = crtc->driver_private;
struct sna_crtc *sna_crtc = crtc->driver_private;
if (crtc->enabled)
sna_crtc->active = sna_crtc_is_bound(sna, crtc);
}
else
sna_crtc->active = false;
}
}

2
src/sna/sna_driver.c
View File

@ -608,7 +608,7 @@ sna_handle_uevents(int fd, void *closure)
if (memcmp(&s.st_rdev, &udev_devnum, sizeof (dev_t)) == 0 &&
hotplug && atoi(hotplug) == 1) {
DBG(("%s: hotplug event\n", __FUNCTION__));
sna_mode_hotplug(sna);
sna_mode_update(sna);
RRGetInfo(xf86ScrnToScreen(scrn), TRUE);
}