Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/i915: split out gem/i915_gem_dmabuf.h from i915_drv.h

We already have the gem/i915_gem_dmabuf.c file.

Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2f3fa0fb7cd78c204e27b2454410b6530289efdc.1644507885.git.jani.nikula@intel.com

+24 -5
+1
drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
··· 11 11 12 12 #include <asm/smp.h> 13 13 14 + #include "gem/i915_gem_dmabuf.h" 14 15 #include "i915_drv.h" 15 16 #include "i915_gem_object.h" 16 17 #include "i915_scatterlist.h"
+18
drivers/gpu/drm/i915/gem/i915_gem_dmabuf.h
··· 1 + /* SPDX-License-Identifier: MIT */ 2 + /* 3 + * Copyright © 2022 Intel Corporation 4 + */ 5 + 6 + #ifndef __I915_GEM_DMABUF_H__ 7 + #define __I915_GEM_DMABUF_H__ 8 + 9 + struct drm_gem_object; 10 + struct drm_device; 11 + struct dma_buf; 12 + 13 + struct drm_gem_object *i915_gem_prime_import(struct drm_device *dev, 14 + struct dma_buf *dma_buf); 15 + 16 + struct dma_buf *i915_gem_prime_export(struct drm_gem_object *gem_obj, int flags); 17 + 18 + #endif /* __I915_GEM_DMABUF_H__ */
+2
drivers/gpu/drm/i915/gem/i915_gem_object.c
··· 26 26 27 27 #include "display/intel_frontbuffer.h" 28 28 #include "pxp/intel_pxp.h" 29 + 29 30 #include "i915_drv.h" 30 31 #include "i915_gem_clflush.h" 31 32 #include "i915_gem_context.h" 33 + #include "i915_gem_dmabuf.h" 32 34 #include "i915_gem_mman.h" 33 35 #include "i915_gem_object.h" 34 36 #include "i915_gem_ttm.h"
+2
drivers/gpu/drm/i915/gvt/dmabuf.c
··· 31 31 #include <linux/dma-buf.h> 32 32 #include <linux/vfio.h> 33 33 34 + #include "gem/i915_gem_dmabuf.h" 35 + 34 36 #include "i915_drv.h" 35 37 #include "i915_reg.h" 36 38 #include "gvt.h"
+1
drivers/gpu/drm/i915/i915_driver.c
··· 62 62 #include "display/intel_vga.h" 63 63 64 64 #include "gem/i915_gem_context.h" 65 + #include "gem/i915_gem_dmabuf.h" 65 66 #include "gem/i915_gem_ioctls.h" 66 67 #include "gem/i915_gem_mman.h" 67 68 #include "gem/i915_gem_pm.h"
-5
drivers/gpu/drm/i915/i915_drv.h
··· 1625 1625 int i915_gem_object_set_cache_level(struct drm_i915_gem_object *obj, 1626 1626 enum i915_cache_level cache_level); 1627 1627 1628 - struct drm_gem_object *i915_gem_prime_import(struct drm_device *dev, 1629 - struct dma_buf *dma_buf); 1630 - 1631 - struct dma_buf *i915_gem_prime_export(struct drm_gem_object *gem_obj, int flags); 1632 - 1633 1628 static inline struct i915_address_space * 1634 1629 i915_gem_vm_lookup(struct drm_i915_file_private *file_priv, u32 id) 1635 1630 {