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

drm/i915: extract gem/i915_gem_stolen.h from i915_drv.h

It used to be handy that we only had a couple of headers, but over time
i915_drv.h has become unwieldy. Extract declarations to a separate
header file corresponding to the implementation module, clarifying the
modularity of the driver.

Ensure the new header is self-contained, and do so with minimal further
includes, using forward declarations as needed. Include the new header
from i915_drv.h to avoid sprinkling includes all over the place; this
can be changed as a follow-up if necessary.

No functional changes.

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/0141b4e1f1bf2deb65730ce6973863a3a16ab38f.1565271681.git.jani.nikula@intel.com

+39 -23
+1
drivers/gpu/drm/i915/gem/i915_gem_stolen.c
··· 11 11 #include <drm/i915_drm.h> 12 12 13 13 #include "i915_drv.h" 14 + #include "i915_gem_stolen.h" 14 15 15 16 /* 16 17 * The BIOS typically reserves some of the system's memory for the exclusive
+35
drivers/gpu/drm/i915/gem/i915_gem_stolen.h
··· 1 + /* SPDX-License-Identifier: MIT */ 2 + /* 3 + * Copyright © 2019 Intel Corporation 4 + */ 5 + 6 + #ifndef __I915_GEM_STOLEN_H__ 7 + #define __I915_GEM_STOLEN_H__ 8 + 9 + #include <linux/types.h> 10 + 11 + struct drm_i915_private; 12 + struct drm_mm_node; 13 + struct drm_i915_gem_object; 14 + 15 + int i915_gem_stolen_insert_node(struct drm_i915_private *dev_priv, 16 + struct drm_mm_node *node, u64 size, 17 + unsigned alignment); 18 + int i915_gem_stolen_insert_node_in_range(struct drm_i915_private *dev_priv, 19 + struct drm_mm_node *node, u64 size, 20 + unsigned alignment, u64 start, 21 + u64 end); 22 + void i915_gem_stolen_remove_node(struct drm_i915_private *dev_priv, 23 + struct drm_mm_node *node); 24 + int i915_gem_init_stolen(struct drm_i915_private *dev_priv); 25 + void i915_gem_cleanup_stolen(struct drm_i915_private *dev_priv); 26 + struct drm_i915_gem_object * 27 + i915_gem_object_create_stolen(struct drm_i915_private *dev_priv, 28 + resource_size_t size); 29 + struct drm_i915_gem_object * 30 + i915_gem_object_create_stolen_for_preallocated(struct drm_i915_private *dev_priv, 31 + resource_size_t stolen_offset, 32 + resource_size_t gtt_offset, 33 + resource_size_t size); 34 + 35 + #endif /* __I915_GEM_STOLEN_H__ */
-1
drivers/gpu/drm/i915/gt/intel_gt.c
··· 4 4 */ 5 5 6 6 #include "i915_drv.h" 7 - 8 7 #include "intel_gt.h" 9 8 #include "intel_gt_pm.h" 10 9 #include "intel_uncore.h"
+3 -22
drivers/gpu/drm/i915/i915_drv.h
··· 70 70 #include "display/intel_frontbuffer.h" 71 71 #include "display/intel_opregion.h" 72 72 73 + #include "gem/i915_gem_context_types.h" 74 + #include "gem/i915_gem_stolen.h" 75 + 73 76 #include "gt/intel_lrc.h" 74 77 #include "gt/intel_engine.h" 75 78 #include "gt/intel_gt_types.h" ··· 87 84 #include "intel_wopcm.h" 88 85 89 86 #include "i915_gem.h" 90 - #include "gem/i915_gem_context_types.h" 91 87 #include "i915_gem_fence_reg.h" 92 88 #include "i915_gem_gtt.h" 93 89 #include "i915_gpu_error.h" ··· 2430 2428 struct drm_mm_node *node, 2431 2429 unsigned int flags); 2432 2430 int i915_gem_evict_vm(struct i915_address_space *vm); 2433 - 2434 - /* i915_gem_stolen.c */ 2435 - int i915_gem_stolen_insert_node(struct drm_i915_private *dev_priv, 2436 - struct drm_mm_node *node, u64 size, 2437 - unsigned alignment); 2438 - int i915_gem_stolen_insert_node_in_range(struct drm_i915_private *dev_priv, 2439 - struct drm_mm_node *node, u64 size, 2440 - unsigned alignment, u64 start, 2441 - u64 end); 2442 - void i915_gem_stolen_remove_node(struct drm_i915_private *dev_priv, 2443 - struct drm_mm_node *node); 2444 - int i915_gem_init_stolen(struct drm_i915_private *dev_priv); 2445 - void i915_gem_cleanup_stolen(struct drm_i915_private *dev_priv); 2446 - struct drm_i915_gem_object * 2447 - i915_gem_object_create_stolen(struct drm_i915_private *dev_priv, 2448 - resource_size_t size); 2449 - struct drm_i915_gem_object * 2450 - i915_gem_object_create_stolen_for_preallocated(struct drm_i915_private *dev_priv, 2451 - resource_size_t stolen_offset, 2452 - resource_size_t gtt_offset, 2453 - resource_size_t size); 2454 2431 2455 2432 /* i915_gem_internal.c */ 2456 2433 struct drm_i915_gem_object *