aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2012-01-23 22:39:56 -0500
committerBen Skeggs <bskeggs@redhat.com>2012-03-13 03:09:00 -0400
commitb830973b68895813b911fb04626d907744e7d7a2 (patch)
treeb1a3b440fcd33f8147922200e99ad65f1bcb69bf /drivers
parenta9bc247cbbc6310d2aefe4db0a6e92defde4426b (diff)
drm/nouveau/pm: fix dll off -> dll on transitions
Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Signed-off-by: Martin Peres <martin.peres@labri.fr>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_mem.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c
index f0e2a439f26a..e4ba4abca31a 100644
--- a/drivers/gpu/drm/nouveau/nouveau_mem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_mem.c
@@ -1016,7 +1016,8 @@ nouveau_mem_exec(struct nouveau_mem_exec_func *exec,
1016 } 1016 }
1017 1017
1018 if (mr[1] != info->mr[1]) { 1018 if (mr[1] != info->mr[1]) {
1019 exec->mrs (exec, 1, info->mr[1]); 1019 /* need to keep DLL off until later, at least on GDDR3 */
1020 exec->mrs (exec, 1, info->mr[1] | (mr[1] & mr1_dlloff));
1020 exec->wait(exec, tMRD); 1021 exec->wait(exec, tMRD);
1021 } 1022 }
1022 1023
@@ -1028,8 +1029,12 @@ nouveau_mem_exec(struct nouveau_mem_exec_func *exec,
1028 /* update PFB timing registers */ 1029 /* update PFB timing registers */
1029 exec->timing_set(exec); 1030 exec->timing_set(exec);
1030 1031
1031 /* DLL reset */ 1032 /* DLL (enable + ) reset */
1032 if (!(info->mr[1] & mr1_dlloff)) { 1033 if (!(info->mr[1] & mr1_dlloff)) {
1034 if (mr[1] & mr1_dlloff) {
1035 exec->mrs (exec, 1, info->mr[1]);
1036 exec->wait(exec, tMRD);
1037 }
1033 exec->mrs (exec, 0, info->mr[0] | 0x00000100); 1038 exec->mrs (exec, 0, info->mr[0] | 0x00000100);
1034 exec->wait(exec, tMRD); 1039 exec->wait(exec, tMRD);
1035 exec->mrs (exec, 0, info->mr[0] | 0x00000000); 1040 exec->mrs (exec, 0, info->mr[0] | 0x00000000);