Commit 7a2f9743 authored by Ben Skeggs's avatar Ben Skeggs

drm/gf100-/pwr/memx: block host and fifo around reclock

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 30da0806
...@@ -84,6 +84,22 @@ memx_func_enter: ...@@ -84,6 +84,22 @@ memx_func_enter:
movw $r6 0x2 movw $r6 0x2
or $r7 $r6 or $r7 $r6
nv_wr32($r8, $r7) nv_wr32($r8, $r7)
#else
movw $r6 0x001620
imm32($r7, ~0x00000aa2);
nv_rd32($r8, $r6)
and $r8 $r7
nv_wr32($r6, $r8)
imm32($r7, ~0x00000001)
nv_rd32($r8, $r6)
and $r8 $r7
nv_wr32($r6, $r8)
movw $r6 0x0026f0
nv_rd32($r8, $r6)
and $r8 $r7
nv_wr32($r6, $r8)
#endif #endif
mov $r6 NV_PPWR_OUTPUT_SET_FB_PAUSE mov $r6 NV_PPWR_OUTPUT_SET_FB_PAUSE
...@@ -95,7 +111,6 @@ memx_func_enter: ...@@ -95,7 +111,6 @@ memx_func_enter:
nv_iord($r6, NV_PPWR_TIMER_LOW) nv_iord($r6, NV_PPWR_TIMER_LOW)
st b32 D[$r0 + #memx_ts_start] $r6 st b32 D[$r0 + #memx_ts_start] $r6
ret ret
// description // description
...@@ -121,8 +136,23 @@ memx_func_leave: ...@@ -121,8 +136,23 @@ memx_func_leave:
imm32($r6, 0xffffffcc) imm32($r6, 0xffffffcc)
and $r7 $r6 and $r7 $r6
nv_wr32($r8, $r7) nv_wr32($r8, $r7)
#else
movw $r6 0x0026f0
imm32($r7, 0x00000001)
nv_rd32($r8, $r6)
or $r8 $r7
nv_wr32($r6, $r8)
movw $r6 0x001620
nv_rd32($r8, $r6)
or $r8 $r7
nv_wr32($r6, $r8)
imm32($r7, 0x00000aa2);
nv_rd32($r8, $r6)
or $r8 $r7
nv_wr32($r6, $r8)
#endif #endif
ret ret
#if NVKM_PPWR_CHIPSET < GF119 #if NVKM_PPWR_CHIPSET < GF119
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment