summaryrefslogtreecommitdiff
path: root/linux-core/nv50_display.c
diff options
context:
space:
mode:
authorMaarten Maathuis <madman2003@gmail.com>2008-07-02 16:13:54 +0200
committerMaarten Maathuis <madman2003@gmail.com>2008-07-02 16:14:48 +0200
commitf1fe9178f1a2aef272c7feeb15c8de42c8c609d5 (patch)
tree515703f927e30626f7f4eedd026a2e8818ba6e97 /linux-core/nv50_display.c
parentb28d309210475b6f671af7617c779bd1d7a6810a (diff)
NV50: basic fbcon + misc fixes
- There is one fb, used for as many outputs as possible. - Eventually smaller screens will be scaled to see the full console, but for the moment this'll do.
Diffstat (limited to 'linux-core/nv50_display.c')
-rw-r--r--linux-core/nv50_display.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/linux-core/nv50_display.c b/linux-core/nv50_display.c
index 1d828552..cd527c44 100644
--- a/linux-core/nv50_display.c
+++ b/linux-core/nv50_display.c
@@ -337,10 +337,11 @@ void nv50_display_command(struct drm_nouveau_private *dev_priv, uint32_t mthd, u
while (NV_READ(NV50_PDISPLAY_CTRL_STATE) & NV50_PDISPLAY_CTRL_STATE_PENDING) {
counter++;
- if (counter > 25000) {
+ if (counter > 1000000) {
DRM_ERROR("You probably need a reboot now\n");
break;
}
+ udelay(1);
}
}