From b76f7e4ba1d7e77983fb4c0d20a7689e66bd31a2 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Mon, 3 Jun 2013 16:40:14 +1000 Subject: [PATCH] --- yaml --- r: 376827 b: refs/heads/master c: d40ee48acde16894fb3b241d7e896d5fa84e0f10 h: refs/heads/master i: 376825: 7147be9bd60d50149e2c035a8bf5a1d5a8a9cc84 376823: e3b4c13e78a97822168c0abed8c1ea25ec992ffc v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nv50_display.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1f060e852b7e..81f018a9c1fe 100644 --- 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 index 325887390677..e843cf86bcce 100644 --- 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)