summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2018-07-02 13:44:05 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2018-07-06 00:48:56 -0400
commit26783b85bfee4c2ef4f2ccc2d16ebc783dd0aa7d (patch)
tree3fbfb7dbbc39d95af270740fe642652f0b3e264e /drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c
parent3e12cea363c8a09038e870d7df9c047294a0a6a1 (diff)
gpu: nvpgu: Rename Linux specific vidmem code
Rename os/linux/vidmem.c to os/linux/dmabuf_vidmem.c. The code is mainly dealing with interfacing with Linux dmabuf framework and its responsibilities got confused with common/mm/vidmem.c. Also move the header include/nvgpu/linux/vidmem.h to os/linux/dmabuf_vidmem.h. It does not expose any interface to outside Linux code. Change-Id: I2cb1057a8934d5cb5c5860023aa12f8f048a6684 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1768261 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c')
-rw-r--r--drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c b/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c
index f9ad8082..17f1e923 100644
--- a/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c
+++ b/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c
@@ -30,8 +30,6 @@
30#include <nvgpu/enabled.h> 30#include <nvgpu/enabled.h>
31#include <nvgpu/sizes.h> 31#include <nvgpu/sizes.h>
32 32
33#include <nvgpu/linux/vidmem.h>
34
35#include "ioctl_ctrl.h" 33#include "ioctl_ctrl.h"
36#include "ioctl_dbg.h" 34#include "ioctl_dbg.h"
37#include "ioctl_as.h" 35#include "ioctl_as.h"
@@ -44,6 +42,7 @@
44#include "os_linux.h" 42#include "os_linux.h"
45#include "dmabuf.h" 43#include "dmabuf.h"
46#include "channel.h" 44#include "channel.h"
45#include "dmabuf_vidmem.h"
47 46
48#define HZ_TO_MHZ(a) ((a > 0xF414F9CD7ULL) ? 0xffff : (a >> 32) ? \ 47#define HZ_TO_MHZ(a) ((a > 0xF414F9CD7ULL) ? 0xffff : (a >> 32) ? \
49 (u32) ((a * 0x10C8ULL) >> 32) : (u16) ((u32) a/MHZ)) 48 (u32) ((a * 0x10C8ULL) >> 32) : (u16) ((u32) a/MHZ))