summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Courbot <acourbot@nvidia.com>2015-10-22 19:25:41 +0900
committerAlexandre Courbot <acourbot@nvidia.com>2015-10-26 11:19:17 +0900
commitb61fe7abcc02f24f35f32b08067fbe0225666cc1 (patch)
tree027a52c0cfe42708fc2c26a8837dd122c88dacb6
parent83df68510771116b2049a80fe3ac21eaf3355c23 (diff)
downloadnouveau-b61fe7abcc02f24f35f32b08067fbe0225666cc1.tar.gz
Compile fixes for GM20B
-rw-r--r--drm/nouveau/nouveau_bo.c1
-rw-r--r--drm/nouveau/nouveau_display.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/drm/nouveau/nouveau_bo.c b/drm/nouveau/nouveau_bo.c
index 15057b394..0733fdba6 100644
--- a/drm/nouveau/nouveau_bo.c
+++ b/drm/nouveau/nouveau_bo.c
@@ -1,3 +1,4 @@
+#define __OS_HAS_AGP 0
/*
* Copyright 2007 Dave Airlied
* All Rights Reserved.
diff --git a/drm/nouveau/nouveau_display.c b/drm/nouveau/nouveau_display.c
index 7ab14a2d1..a621b252f 100644
--- a/drm/nouveau/nouveau_display.c
+++ b/drm/nouveau/nouveau_display.c
@@ -116,7 +116,7 @@ nouveau_display_scanoutpos_head(struct drm_crtc *crtc, int *vpos, int *hpos,
break;
}
- if (retry) ndelay(crtc->linedur_ns);
+ //if (retry) ndelay(crtc->linedur_ns);
} while (retry--);
*hpos = args.scan.hline;