From 7de4cde25fbb38b14c6b9f0f99d8f6fd11522f59 Mon Sep 17 00:00:00 2001 From: Martin Peres Date: Mon, 9 Jan 2012 15:23:10 +1000 Subject: [PATCH] --- yaml --- r: 293744 b: refs/heads/master c: c57ebf5ef3588d21031f12e39131d79071269845 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nv50_pm.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 671822132ff8..c4b7b1287a32 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 496a73bbecb81e6753715995e4519d152f814667 +refs/heads/master: c57ebf5ef3588d21031f12e39131d79071269845 diff --git a/trunk/drivers/gpu/drm/nouveau/nv50_pm.c b/trunk/drivers/gpu/drm/nouveau/nv50_pm.c index 0f2632638c92..e677310c8f57 100644 --- a/trunk/drivers/gpu/drm/nouveau/nv50_pm.c +++ b/trunk/drivers/gpu/drm/nouveau/nv50_pm.c @@ -798,6 +798,8 @@ nv50_pm_clocks_set(struct drm_device *dev, void *data) nv_mask(dev, 0x002504, 0x00000001, 0x00000001); if (!nv_wait(dev, 0x002504, 0x00000010, 0x00000010)) goto resume; + if (!nv_wait(dev, 0x00251c, 0x0000003f, 0x0000003f)) + goto resume; /* program memory clock, if necessary - must come before engine clock * reprogramming due to how we construct the hwsq scripts in pre()