---

yaml --- r: 376827 b: refs/heads/master c: d40ee48 h: refs/heads/master i: 376825: 7147be9 376823: e3b4c13 v: v3
git-mirror · Jun 5, 2013 · b76f7e4 · b76f7e4
1 parent e405848
commit b76f7e4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea9197cc323839ef3d5280c0453b2c622caa6bc7
+refs/heads/master: d40ee48acde16894fb3b241d7e896d5fa84e0f10
diff --git a/trunk/drivers/gpu/drm/nouveau/nv50_display.c b/trunk/drivers/gpu/drm/nouveau/nv50_display.c
@@ -1554,7 +1554,9 @@ nv50_dac_detect(struct drm_encoder *encoder, struct drm_connector *connector)
 {
 	struct nv50_disp *disp = nv50_disp(encoder->dev);
 	int ret, or = nouveau_encoder(encoder)->or;
-	u32 load = 0;
+	u32 load = nouveau_drm(encoder->dev)->vbios.dactestval;
+	if (load == 0)
+		load = 340;
 
 	ret = nv_exec(disp->core, NV50_DISP_DAC_LOAD + or, &load, sizeof(load));
 	if (ret || load != 7)