summaryrefslogtreecommitdiff
authorChris Wilson <chris@chris-wilson.co.uk>2012-05-25 13:34:16 (GMT)
committer Chris Wilson <chris@chris-wilson.co.uk>2012-05-25 13:34:16 (GMT)
commit317bf05196086eb5dedb6436c07f253f01c9bf63 (patch) (side-by-side diff)
tree5f6292eaa163ef88bb53b62f4c756610911d7182
parenta5fe863e3f1a6750edaffb518c4e768e9bc11521 (diff)
downloadxf86-video-intel-master.zip
xf86-video-intel-master.tar.gz
sna: Perform the selftest after probingHEADmaster
We do no want to slow down the detection phase by performing our self-tests, so only running those before initialising the driver. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/sna/sna_driver.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index 0f43a46..f3f19e1 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -396,8 +396,6 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags)
DBG(("%s\n", __FUNCTION__));
- sna_selftest();
-
if (scrn->numEntities != 1)
return FALSE;
@@ -408,6 +406,8 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags)
if (flags & PROBE_DETECT)
return TRUE;
+ sna_selftest();
+
sna = to_sna(scrn);
if (sna == NULL) {
sna = xnfcalloc(sizeof(struct sna), 1);