drm/nouveau/pm: some more delays for ddr3 reclocking

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / nouveau / nouveau_mem.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c
index ec4c53f411717e62ce27b67e1c467ce7e5212971..585dcbeafcdafdcfdbda9e51dd1bcb29e01dc1e9 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_mem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_mem.c
@@ -978,6 +978,8 @@ nouveau_mem_exec(struct nouveau_mem_exec_func *exec,
                break;
        case NV_MEM_TYPE_DDR3:
                tDLLK = 12000;
+               tCKSRE = 2000;
+               tXS = 1000;
                mr1_dlloff = 0x00000001;
                break;
        case NV_MEM_TYPE_GDDR3:
@@ -1024,6 +1026,7 @@ nouveau_mem_exec(struct nouveau_mem_exec_func *exec,
        exec->refresh_self(exec, false);
        exec->refresh_auto(exec, true);
        exec->wait(exec, tXS);
+       exec->wait(exec, tXS);
 
        /* update MRs */
        if (mr[2] != info->mr[2]) {