summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2009-11-03 10:46:23 +1000
committerBen Skeggs <bskeggs@redhat.com>2009-11-03 10:46:23 +1000
commita649fb5fdf24336cc68454fdd249c787b2aeca19 (patch)
treea95433f2a138a8535f2481659b89d5d8b9b9b20b
parent41a652f511eace6094ae6d4ec5db9da24944cbcf (diff)
drm/nouveau: avoid 2s delays when dry-running init scripts
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_bios.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
index 2a166a20f942..10795082f06b 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
@@ -1683,6 +1683,9 @@ init_condition_time(struct nvbios *bios, uint16_t offset,
BIOSLOG(bios, "0x%04X: Condition: 0x%02X, Retries: 0x%02X\n",
offset, cond, retries);
+ if (!bios->execute) /* avoid 2s delays when "faking" execution */
+ retries = 1;
+
for (cnt = 0; cnt < retries; cnt++) {
if (bios_condition_met(bios, offset, cond)) {
BIOSLOG(bios, "0x%04X: Condition met, continuing\n",