From: Ben Skeggs Date: Thu, 11 Sep 2014 12:59:13 +0000 (+1000) Subject: drm/nouveau/pwr/memx: rename fb off/on to block/unblock X-Git-Tag: omap-for-v3.19/prcm-cleanup~70^2~36^2~13 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=630a6a466b5afff0ec5824e6f62e5dba15812256;p=pandora-kernel.git 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 --- diff --git a/drivers/gpu/drm/nouveau/core/include/subdev/pwr.h b/drivers/gpu/drm/nouveau/core/include/subdev/pwr.h index 1c4668505970..bf3d1f611333 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 Reading git-diff-tree failed