diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2014-09-11 22:59:13 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-09-15 22:25:12 +1000 |
| commit | 630a6a466b5afff0ec5824e6f62e5dba15812256 (patch) | |
| tree | 6dab4baf30fd715b3a5be6677249366644fc0586 /drivers/gpu/drm/nouveau/core/include/subdev | |
| parent | 2fe7eaa0d4c9cf26b379a8054a87c4bf7ac4dc12 (diff) | |
| download | op-kernel-dev-630a6a466b5afff0ec5824e6f62e5dba15812256.zip op-kernel-dev-630a6a466b5afff0ec5824e6f62e5dba15812256.tar.gz | |
drm/nouveau/pwr/memx: rename fb off/on to block/unblock
More accurate as to the function of the opcodes. Not only is FB disabled,
but the host is prevented from touching the GPU. An upcoming patch for
Kepler will also halt PFIFO (as NVIDIA does).
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/include/subdev')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/include/subdev/pwr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/core/include/subdev/pwr.h b/drivers/gpu/drm/nouveau/core/include/subdev/pwr.h index 1c46685..bf3d1f6 100644 --- a/drivers/gpu/drm/nouveau/core/include/subdev/pwr.h +++ b/drivers/gpu/drm/nouveau/core/include/subdev/pwr.h @@ -48,7 +48,7 @@ void nouveau_memx_wait(struct nouveau_memx *, u32 addr, u32 mask, u32 data, u32 nsec); void nouveau_memx_nsec(struct nouveau_memx *, u32 nsec); void nouveau_memx_wait_vblank(struct nouveau_memx *); -void nouveau_memx_fb_disable(struct nouveau_memx *); -void nouveau_memx_fb_enable(struct nouveau_memx *); +void nouveau_memx_block(struct nouveau_memx *); +void nouveau_memx_unblock(struct nouveau_memx *); #endif |
