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

drm/i915: add i915_config.h and move relevant declarations there

We already have i915_config.c. Add the i915_config.h counterpart, and
declutter i915_drv.h in the process.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Acked-by: Nirmoy Das <nirmoy.das@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230118131538.3558599-1-jani.nikula@intel.com

+30 -10
+1
drivers/gpu/drm/i915/display/intel_atomic_plane.c
··· 36 36 37 37 #include "gt/intel_rps.h" 38 38 39 + #include "i915_config.h" 39 40 #include "intel_atomic_plane.h" 40 41 #include "intel_cdclk.h" 41 42 #include "intel_display_trace.h"
+1
drivers/gpu/drm/i915/gem/i915_gem_clflush.c
··· 8 8 9 9 #include "display/intel_frontbuffer.h" 10 10 11 + #include "i915_config.h" 11 12 #include "i915_drv.h" 12 13 #include "i915_gem_clflush.h" 13 14 #include "i915_sw_fence_work.h"
+4 -1
drivers/gpu/drm/i915/i915_config.c
··· 3 3 * Copyright © 2020 Intel Corporation 4 4 */ 5 5 6 - #include "i915_drv.h" 6 + #include <linux/kernel.h> 7 + 8 + #include "i915_config.h" 9 + #include "i915_utils.h" 7 10 8 11 unsigned long 9 12 i915_fence_context_timeout(const struct drm_i915_private *i915, u64 context)
+23
drivers/gpu/drm/i915/i915_config.h
··· 1 + /* SPDX-License-Identifier: MIT */ 2 + /* 3 + * Copyright © 2023 Intel Corporation 4 + */ 5 + 6 + #ifndef __I915_CONFIG_H__ 7 + #define __I915_CONFIG_H__ 8 + 9 + #include <linux/types.h> 10 + #include <linux/limits.h> 11 + 12 + struct drm_i915_private; 13 + 14 + unsigned long i915_fence_context_timeout(const struct drm_i915_private *i915, 15 + u64 context); 16 + 17 + static inline unsigned long 18 + i915_fence_timeout(const struct drm_i915_private *i915) 19 + { 20 + return i915_fence_context_timeout(i915, U64_MAX); 21 + } 22 + 23 + #endif /* __I915_CONFIG_H__ */
-9
drivers/gpu/drm/i915/i915_drv.h
··· 195 195 196 196 #define I915_IDLE_ENGINES_TIMEOUT (200) /* in ms */ 197 197 198 - unsigned long i915_fence_context_timeout(const struct drm_i915_private *i915, 199 - u64 context); 200 - 201 - static inline unsigned long 202 - i915_fence_timeout(const struct drm_i915_private *i915) 203 - { 204 - return i915_fence_context_timeout(i915, U64_MAX); 205 - } 206 - 207 198 #define HAS_HW_SAGV_WM(i915) (DISPLAY_VER(i915) >= 13 && !IS_DGFX(i915)) 208 199 209 200 struct i915_virtual_gpu {
+1
drivers/gpu/drm/i915/i915_request.c
··· 43 43 #include "gt/intel_rps.h" 44 44 45 45 #include "i915_active.h" 46 + #include "i915_config.h" 46 47 #include "i915_deps.h" 47 48 #include "i915_driver.h" 48 49 #include "i915_drv.h"