Skip to content

Commit 2fc37c0

Browse files
committed
drm/i915/gem: remove inlines from i915_gem_execbuffer.c
Just let the compiler decide what's best. Turns out absolutely nothing changes in the output with the inlines removed. Signed-off-by: Jani Nikula <[email protected]> Reviewed-by: Rodrigo Vivi <[email protected]> Reviewed-by: Andi Shyti <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 82b1e8f commit 2fc37c0

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ static int eb_pin_engine(struct i915_execbuffer *eb, bool throttle);
321321
static void eb_unpin_engine(struct i915_execbuffer *eb);
322322
static void eb_capture_release(struct i915_execbuffer *eb);
323323

324-
static inline bool eb_use_cmdparser(const struct i915_execbuffer *eb)
324+
static bool eb_use_cmdparser(const struct i915_execbuffer *eb)
325325
{
326326
return intel_engine_requires_cmd_parser(eb->context->engine) ||
327327
(intel_engine_using_cmd_parser(eb->context->engine) &&
@@ -433,7 +433,7 @@ static u64 eb_pin_flags(const struct drm_i915_gem_exec_object2 *entry,
433433
return pin_flags;
434434
}
435435

436-
static inline int
436+
static int
437437
eb_pin_vma(struct i915_execbuffer *eb,
438438
const struct drm_i915_gem_exec_object2 *entry,
439439
struct eb_vma *ev)
@@ -486,7 +486,7 @@ eb_pin_vma(struct i915_execbuffer *eb,
486486
return 0;
487487
}
488488

489-
static inline void
489+
static void
490490
eb_unreserve_vma(struct eb_vma *ev)
491491
{
492492
if (unlikely(ev->flags & __EXEC_OBJECT_HAS_FENCE))
@@ -548,7 +548,7 @@ eb_validate_vma(struct i915_execbuffer *eb,
548548
return 0;
549549
}
550550

551-
static inline bool
551+
static bool
552552
is_batch_buffer(struct i915_execbuffer *eb, unsigned int buffer_idx)
553553
{
554554
return eb->args->flags & I915_EXEC_BATCH_FIRST ?
@@ -628,8 +628,8 @@ eb_add_vma(struct i915_execbuffer *eb,
628628
return 0;
629629
}
630630

631-
static inline int use_cpu_reloc(const struct reloc_cache *cache,
632-
const struct drm_i915_gem_object *obj)
631+
static int use_cpu_reloc(const struct reloc_cache *cache,
632+
const struct drm_i915_gem_object *obj)
633633
{
634634
if (!i915_gem_object_has_struct_page(obj))
635635
return false;
@@ -1107,7 +1107,7 @@ static void eb_destroy(const struct i915_execbuffer *eb)
11071107
kfree(eb->buckets);
11081108
}
11091109

1110-
static inline u64
1110+
static u64
11111111
relocation_target(const struct drm_i915_gem_relocation_entry *reloc,
11121112
const struct i915_vma *target)
11131113
{
@@ -1128,19 +1128,19 @@ static void reloc_cache_init(struct reloc_cache *cache,
11281128
cache->node.flags = 0;
11291129
}
11301130

1131-
static inline void *unmask_page(unsigned long p)
1131+
static void *unmask_page(unsigned long p)
11321132
{
11331133
return (void *)(uintptr_t)(p & PAGE_MASK);
11341134
}
11351135

1136-
static inline unsigned int unmask_flags(unsigned long p)
1136+
static unsigned int unmask_flags(unsigned long p)
11371137
{
11381138
return p & ~PAGE_MASK;
11391139
}
11401140

11411141
#define KMAP 0x4 /* after CLFLUSH_FLAGS */
11421142

1143-
static inline struct i915_ggtt *cache_to_ggtt(struct reloc_cache *cache)
1143+
static struct i915_ggtt *cache_to_ggtt(struct reloc_cache *cache)
11441144
{
11451145
struct drm_i915_private *i915 =
11461146
container_of(cache, struct i915_execbuffer, reloc_cache)->i915;

0 commit comments

Comments
 (0)