Commit aa8e2435 authored by Thomas Zimmermann's avatar Thomas Zimmermann Committed by Alex Deucher

drm/ttm: Define a single DRM_FILE_PAGE_OFFSET constant

Most TTM drivers define the constant DRM_FILE_PAGE_OFFSET of the same
value. The only exception is vboxvideo, which is being converted to the
new offset by this patch. Unifying the constants in a single place
simplifies the driver code.
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent fd16ac8e
...@@ -51,8 +51,6 @@ ...@@ -51,8 +51,6 @@
#include "amdgpu_sdma.h" #include "amdgpu_sdma.h"
#include "bif/bif_4_1_d.h" #include "bif/bif_4_1_d.h"
#define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
static int amdgpu_map_buffer(struct ttm_buffer_object *bo, static int amdgpu_map_buffer(struct ttm_buffer_object *bo,
struct ttm_mem_reg *mem, unsigned num_pages, struct ttm_mem_reg *mem, unsigned num_pages,
uint64_t offset, unsigned window, uint64_t offset, unsigned window,
......
...@@ -353,8 +353,6 @@ extern int ast_dumb_mmap_offset(struct drm_file *file, ...@@ -353,8 +353,6 @@ extern int ast_dumb_mmap_offset(struct drm_file *file,
uint32_t handle, uint32_t handle,
uint64_t *offset); uint64_t *offset);
#define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
int ast_mm_init(struct ast_private *ast); int ast_mm_init(struct ast_private *ast);
void ast_mm_fini(struct ast_private *ast); void ast_mm_fini(struct ast_private *ast);
......
...@@ -101,8 +101,6 @@ static inline struct bochs_bo *gem_to_bochs_bo(struct drm_gem_object *gem) ...@@ -101,8 +101,6 @@ static inline struct bochs_bo *gem_to_bochs_bo(struct drm_gem_object *gem)
return container_of(gem, struct bochs_bo, gem); return container_of(gem, struct bochs_bo, gem);
} }
#define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
static inline u64 bochs_bo_mmap_offset(struct bochs_bo *bo) static inline u64 bochs_bo_mmap_offset(struct bochs_bo *bo)
{ {
return drm_vma_node_offset_addr(&bo->bo.vma_node); return drm_vma_node_offset_addr(&bo->bo.vma_node);
......
...@@ -169,7 +169,6 @@ cirrus_bo(struct ttm_buffer_object *bo) ...@@ -169,7 +169,6 @@ cirrus_bo(struct ttm_buffer_object *bo)
#define to_cirrus_obj(x) container_of(x, struct cirrus_gem_object, base) #define to_cirrus_obj(x) container_of(x, struct cirrus_gem_object, base)
#define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
/* cirrus_main.c */ /* cirrus_main.c */
int cirrus_device_init(struct cirrus_device *cdev, int cirrus_device_init(struct cirrus_device *cdev,
......
...@@ -21,8 +21,6 @@ ...@@ -21,8 +21,6 @@
#include "hibmc_drm_drv.h" #include "hibmc_drm_drv.h"
#define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
static inline struct hibmc_drm_private * static inline struct hibmc_drm_private *
hibmc_bdev(struct ttm_bo_device *bd) hibmc_bdev(struct ttm_bo_device *bd)
{ {
......
...@@ -269,7 +269,6 @@ mgag200_dumb_mmap_offset(struct drm_file *file, ...@@ -269,7 +269,6 @@ mgag200_dumb_mmap_offset(struct drm_file *file,
struct mga_i2c_chan *mgag200_i2c_create(struct drm_device *dev); struct mga_i2c_chan *mgag200_i2c_create(struct drm_device *dev);
void mgag200_i2c_destroy(struct mga_i2c_chan *i2c); void mgag200_i2c_destroy(struct mga_i2c_chan *i2c);
#define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
void mgag200_ttm_placement(struct mgag200_bo *bo, int domain); void mgag200_ttm_placement(struct mgag200_bo *bo, int domain);
static inline int mgag200_bo_reserve(struct mgag200_bo *bo, bool no_wait) static inline int mgag200_bo_reserve(struct mgag200_bo *bo, bool no_wait)
......
...@@ -60,8 +60,6 @@ ...@@ -60,8 +60,6 @@
struct nouveau_channel; struct nouveau_channel;
struct platform_device; struct platform_device;
#define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
#include "nouveau_fence.h" #include "nouveau_fence.h"
#include "nouveau_bios.h" #include "nouveau_bios.h"
#include "nouveau_vmm.h" #include "nouveau_vmm.h"
......
...@@ -65,9 +65,6 @@ ...@@ -65,9 +65,6 @@
extern int qxl_num_crtc; extern int qxl_num_crtc;
extern int qxl_max_ioctls; extern int qxl_max_ioctls;
#define DRM_FILE_OFFSET 0x100000000ULL
#define DRM_FILE_PAGE_OFFSET (DRM_FILE_OFFSET >> PAGE_SHIFT)
#define QXL_INTERRUPT_MASK (\ #define QXL_INTERRUPT_MASK (\
QXL_INTERRUPT_DISPLAY |\ QXL_INTERRUPT_DISPLAY |\
QXL_INTERRUPT_CURSOR |\ QXL_INTERRUPT_CURSOR |\
......
...@@ -45,8 +45,6 @@ ...@@ -45,8 +45,6 @@
#include "radeon_reg.h" #include "radeon_reg.h"
#include "radeon.h" #include "radeon.h"
#define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
static int radeon_ttm_debugfs_init(struct radeon_device *rdev); static int radeon_ttm_debugfs_init(struct radeon_device *rdev);
static void radeon_ttm_debugfs_fini(struct radeon_device *rdev); static void radeon_ttm_debugfs_fini(struct radeon_device *rdev);
......
...@@ -37,8 +37,6 @@ ...@@ -37,8 +37,6 @@
#include <linux/delay.h> #include <linux/delay.h>
#define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
static struct static struct
virtio_gpu_device *virtio_gpu_get_vgdev(struct ttm_bo_device *bdev) virtio_gpu_device *virtio_gpu_get_vgdev(struct ttm_bo_device *bdev)
{ {
......
...@@ -851,7 +851,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) ...@@ -851,7 +851,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
ret = ttm_bo_device_init(&dev_priv->bdev, ret = ttm_bo_device_init(&dev_priv->bdev,
&vmw_bo_driver, &vmw_bo_driver,
dev->anon_inode->i_mapping, dev->anon_inode->i_mapping,
VMWGFX_FILE_PAGE_OFFSET, DRM_FILE_PAGE_OFFSET,
false); false);
if (unlikely(ret != 0)) { if (unlikely(ret != 0)) {
DRM_ERROR("Failed initializing TTM buffer object driver.\n"); DRM_ERROR("Failed initializing TTM buffer object driver.\n");
......
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
#define VMWGFX_DRIVER_MAJOR 2 #define VMWGFX_DRIVER_MAJOR 2
#define VMWGFX_DRIVER_MINOR 15 #define VMWGFX_DRIVER_MINOR 15
#define VMWGFX_DRIVER_PATCHLEVEL 0 #define VMWGFX_DRIVER_PATCHLEVEL 0
#define VMWGFX_FILE_PAGE_OFFSET 0x00100000
#define VMWGFX_FIFO_STATIC_SIZE (1024*1024) #define VMWGFX_FIFO_STATIC_SIZE (1024*1024)
#define VMWGFX_MAX_RELOCATIONS 2048 #define VMWGFX_MAX_RELOCATIONS 2048
#define VMWGFX_MAX_VALIDATIONS 2048 #define VMWGFX_MAX_VALIDATIONS 2048
......
...@@ -33,7 +33,7 @@ int vmw_mmap(struct file *filp, struct vm_area_struct *vma) ...@@ -33,7 +33,7 @@ int vmw_mmap(struct file *filp, struct vm_area_struct *vma)
struct drm_file *file_priv; struct drm_file *file_priv;
struct vmw_private *dev_priv; struct vmw_private *dev_priv;
if (unlikely(vma->vm_pgoff < VMWGFX_FILE_PAGE_OFFSET)) { if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET)) {
DRM_ERROR("Illegal attempt to mmap old fifo space.\n"); DRM_ERROR("Illegal attempt to mmap old fifo space.\n");
return -EINVAL; return -EINVAL;
} }
......
...@@ -209,8 +209,6 @@ int vbox_dumb_mmap_offset(struct drm_file *file, ...@@ -209,8 +209,6 @@ int vbox_dumb_mmap_offset(struct drm_file *file,
struct drm_device *dev, struct drm_device *dev,
u32 handle, u64 *offset); u32 handle, u64 *offset);
#define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
int vbox_mm_init(struct vbox_private *vbox); int vbox_mm_init(struct vbox_private *vbox);
void vbox_mm_fini(struct vbox_private *vbox); void vbox_mm_fini(struct vbox_private *vbox);
......
...@@ -49,6 +49,8 @@ ...@@ -49,6 +49,8 @@
#define TTM_MEMTYPE_FLAG_MAPPABLE (1 << 1) /* Memory mappable */ #define TTM_MEMTYPE_FLAG_MAPPABLE (1 << 1) /* Memory mappable */
#define TTM_MEMTYPE_FLAG_CMA (1 << 3) /* Can't map aperture */ #define TTM_MEMTYPE_FLAG_CMA (1 << 3) /* Can't map aperture */
#define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
struct ttm_mem_type_manager; struct ttm_mem_type_manager;
struct ttm_mem_type_manager_func { struct ttm_mem_type_manager_func {
......
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