diff options
| author |   Roy Spliet <rspliet@eclipso.eu> | 2014-09-04 16:58:50 +0200 |
|---|---|---|
| committer |   Ben Skeggs <bskeggs@redhat.com> | 2014-09-15 22:25:03 +1000 |
| commit | d93e996aed6e48c87dc5703a21b0e9368d4cc1f9 (patch) | |
| tree | 89af3126b01a7c217a250adafe7a36e3cafa1505 /drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/memx.fuc | |
| parent | drm/nva3/pwr/memx: Implement "wait for VBLANK" (diff) | |
| download | linux-dev-d93e996aed6e48c87dc5703a21b0e9368d4cc1f9.tar.xz linux-dev-d93e996aed6e48c87dc5703a21b0e9368d4cc1f9.zip | |
drm/nouveau/pwr/memx: Make FB disable and enable explicit
Needs to be done after wait-for-VBLANK, and NVA3 requires register writes
in between.
Rather than hard-coding register writes, just split out fb_disable and
fb_enable.
v2. Squashed "fb/ramnve0: disable fb before reclocking"
Signed-off-by: Roy Spliet <rspliet@eclipso.eu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/memx.fuc')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/memx.fuc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/memx.fuc b/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/memx.fuc index 228ee0d8194e..9f2f57c6c828 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/memx.fuc +++ b/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/memx.fuc @@ -43,9 +43,9 @@ process(PROC_MEMX, #memx_init, #memx_recv) */ .b32 func memx_func_head: -handler(ENTER , 0x0000, 0x0000, #memx_func_enter) +handler(FB_OFF, 0x0000, 0x0000, #memx_func_enter) memx_func_next: -handler(LEAVE , 0x0000, 0x0000, #memx_func_leave) +handler(FB_ON , 0x0000, 0x0000, #memx_func_leave) handler(WR32 , 0x0000, 0x0002, #memx_func_wr32) handler(WAIT , 0x0004, 0x0000, #memx_func_wait) handler(DELAY , 0x0001, 0x0000, #memx_func_delay) |