iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/i915: Pull GEM ioctls interface to its own file

Browse Source 
Declutter i915_drv/gem.h by moving the ioctl API into its own header.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190528092956.14910-2-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson 2019-05-28 10:29:43 +01:00
parent 5e5d2e209e
commit afa1308596
7 changed files with 66 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
drivers/gpu/drm/i915/gem/i915_gem_ioctls.h Normal file
View File

@ -0,0 +1,52 @@
/*
* SPDX-License-Identifier: MIT
*
* Copyright © 2019 Intel Corporation
*/
#ifndef I915_GEM_IOCTLS_H
#define I915_GEM_IOCTLS_H
struct drm_device;
struct drm_file;
int i915_gem_busy_ioctl(struct drm_device *dev, void *data,
struct drm_file *file);
int i915_gem_create_ioctl(struct drm_device *dev, void *data,
struct drm_file *file);
int i915_gem_execbuffer_ioctl(struct drm_device *dev, void *data,
struct drm_file *file);
int i915_gem_execbuffer2_ioctl(struct drm_device *dev, void *data,
struct drm_file *file);
int i915_gem_get_aperture_ioctl(struct drm_device *dev, void *data,
struct drm_file *file);
int i915_gem_get_caching_ioctl(struct drm_device *dev, void *data,
struct drm_file *file);
int i915_gem_get_tiling_ioctl(struct drm_device *dev, void *data,
struct drm_file *file);
int i915_gem_madvise_ioctl(struct drm_device *dev, void *data,
struct drm_file *file);
int i915_gem_mmap_ioctl(struct drm_device *dev, void *data,
struct drm_file *file);
int i915_gem_mmap_gtt_ioctl(struct drm_device *dev, void *data,
struct drm_file *file);
int i915_gem_pread_ioctl(struct drm_device *dev, void *data,
struct drm_file *file);
int i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,
struct drm_file *file);
int i915_gem_set_caching_ioctl(struct drm_device *dev, void *data,
struct drm_file *file);
int i915_gem_set_domain_ioctl(struct drm_device *dev, void *data,
struct drm_file *file);
int i915_gem_set_tiling_ioctl(struct drm_device *dev, void *data,
struct drm_file *file);
int i915_gem_sw_finish_ioctl(struct drm_device *dev, void *data,
struct drm_file *file);
int i915_gem_throttle_ioctl(struct drm_device *dev, void *data,
struct drm_file *file);
int i915_gem_userptr_ioctl(struct drm_device *dev, void *data,
struct drm_file *file);
int i915_gem_wait_ioctl(struct drm_device *dev, void *data,
struct drm_file *file);
#endif

1
drivers/gpu/drm/i915/i915_drv.c
View File

@ -47,6 +47,7 @@
#include <drm/drm_probe_helper.h> #include <drm/drm_probe_helper.h>
#include <drm/i915_drm.h> #include <drm/i915_drm.h>
#include "gem/i915_gem_ioctls.h"
#include "gt/intel_gt_pm.h" #include "gt/intel_gt_pm.h"
#include "gt/intel_reset.h" #include "gt/intel_reset.h"
#include "gt/intel_workarounds.h" #include "gt/intel_workarounds.h"

38
drivers/gpu/drm/i915/i915_drv.h
View File

@ -2752,46 +2752,8 @@ static inline bool intel_vgpu_active(struct drm_i915_private *dev_priv)
} }
/* i915_gem.c */ /* i915_gem.c */
int i915_gem_create_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
int i915_gem_pread_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
int i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
int i915_gem_mmap_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
int i915_gem_mmap_gtt_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
int i915_gem_set_domain_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
int i915_gem_sw_finish_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
int i915_gem_execbuffer_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
int i915_gem_execbuffer2_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
int i915_gem_busy_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
int i915_gem_get_caching_ioctl(struct drm_device *dev, void *data,
struct drm_file *file);
int i915_gem_set_caching_ioctl(struct drm_device *dev, void *data,
struct drm_file *file);
int i915_gem_throttle_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
int i915_gem_madvise_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
int i915_gem_set_tiling_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
int i915_gem_get_tiling_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
int i915_gem_init_userptr(struct drm_i915_private *dev_priv); int i915_gem_init_userptr(struct drm_i915_private *dev_priv);
void i915_gem_cleanup_userptr(struct drm_i915_private *dev_priv); void i915_gem_cleanup_userptr(struct drm_i915_private *dev_priv);
int i915_gem_userptr_ioctl(struct drm_device *dev, void *data,
struct drm_file *file);
int i915_gem_get_aperture_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
int i915_gem_wait_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
void i915_gem_sanitize(struct drm_i915_private *i915); void i915_gem_sanitize(struct drm_i915_private *i915);
int i915_gem_init_early(struct drm_i915_private *dev_priv); int i915_gem_init_early(struct drm_i915_private *dev_priv);
void i915_gem_cleanup_early(struct drm_i915_private *dev_priv); void i915_gem_cleanup_early(struct drm_i915_private *dev_priv);

1
drivers/gpu/drm/i915/i915_gem.c
View File

@ -39,6 +39,7 @@
#include <linux/dma-buf.h> #include <linux/dma-buf.h>
#include <linux/mman.h> #include <linux/mman.h>
#include "gem/i915_gem_ioctls.h"
#include "gt/intel_engine_pm.h" #include "gt/intel_engine_pm.h"
#include "gt/intel_gt_pm.h" #include "gt/intel_gt_pm.h"
#include "gt/intel_mocs.h" #include "gt/intel_mocs.h"

1
drivers/gpu/drm/i915/i915_gem_execbuffer.c
View File

@ -34,6 +34,7 @@
#include <drm/drm_syncobj.h> #include <drm/drm_syncobj.h>
#include <drm/i915_drm.h> #include <drm/i915_drm.h>
#include "gem/i915_gem_ioctls.h"
#include "gt/intel_gt_pm.h" #include "gt/intel_gt_pm.h"
#include "i915_drv.h" #include "i915_drv.h"

3
drivers/gpu/drm/i915/i915_gem_tiling.c
View File

@ -28,6 +28,9 @@
#include <linux/string.h> #include <linux/string.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <drm/i915_drm.h> #include <drm/i915_drm.h>
#include "gem/i915_gem_ioctls.h"
#include "i915_drv.h" #include "i915_drv.h"
/** /**

12
drivers/gpu/drm/i915/i915_gem_userptr.c
View File

@ -22,16 +22,20 @@
* *
*/ */
#include <drm/i915_drm.h>
#include "i915_drv.h"
#include "i915_trace.h"
#include "intel_drv.h"
#include <linux/mmu_context.h> #include <linux/mmu_context.h>
#include <linux/mmu_notifier.h> #include <linux/mmu_notifier.h>
#include <linux/mempolicy.h> #include <linux/mempolicy.h>
#include <linux/swap.h> #include <linux/swap.h>
#include <linux/sched/mm.h> #include <linux/sched/mm.h>
#include <drm/i915_drm.h>
#include "gem/i915_gem_ioctls.h"
#include "i915_drv.h"
#include "i915_trace.h"
#include "intel_drv.h"
struct i915_mm_struct { struct i915_mm_struct {
struct mm_struct *mm; struct mm_struct *mm;
struct drm_i915_private *i915; struct drm_i915_private *i915;