Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/i915/gem: unify i915 gem object frontbuffer function names
Many of the i915 gem object frontbuffer function names follow the file
name as prefix. Follow suit with the remaining functions, renaming them
i915_gem_object_frontbuffer_*().
Reviewed-by: Jouni Högander <jouni.hogander@intel.com>
Link: https://patch.msgid.link/3415b59497f2c3a79586600d259eeaf58be73498.1772475391.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+17
-17
+1
-1
drivers/gpu/drm/i915/gem/i915_gem_clflush.c
+1
-1
drivers/gpu/drm/i915/gem/i915_gem_clflush.c
+3
-3
drivers/gpu/drm/i915/gem/i915_gem_domain.c
+3
-3
drivers/gpu/drm/i915/gem/i915_gem_domain.c
···
68
68
i915_vma_flush_writes(vma);
69
69
spin_unlock(&obj->vma.lock);
70
70
71
-
i915_gem_object_flush_frontbuffer(obj, ORIGIN_CPU);
71
+
i915_gem_object_frontbuffer_flush(obj, ORIGIN_CPU);
72
72
break;
73
73
74
74
case I915_GEM_DOMAIN_WC:
···
647
647
i915_gem_object_unlock(obj);
648
648
649
649
if (!err && write_domain)
650
-
i915_gem_object_invalidate_frontbuffer(obj, ORIGIN_CPU);
650
+
i915_gem_object_frontbuffer_invalidate(obj, ORIGIN_CPU);
651
651
652
652
out:
653
653
i915_gem_object_put(obj);
···
759
759
}
760
760
761
761
out:
762
-
i915_gem_object_invalidate_frontbuffer(obj, ORIGIN_CPU);
762
+
i915_gem_object_frontbuffer_invalidate(obj, ORIGIN_CPU);
763
763
obj->mm.dirty = true;
764
764
/* return with the pages pinned */
765
765
return 0;
+2
-2
drivers/gpu/drm/i915/gem/i915_gem_object_frontbuffer.c
+2
-2
drivers/gpu/drm/i915/gem/i915_gem_object_frontbuffer.c
···
102
102
&i915->frontbuffer_lock);
103
103
}
104
104
105
-
void __i915_gem_object_flush_frontbuffer(struct drm_i915_gem_object *obj,
105
+
void __i915_gem_object_frontbuffer_flush(struct drm_i915_gem_object *obj,
106
106
enum fb_op_origin origin)
107
107
{
108
108
struct i915_frontbuffer *front;
···
114
114
}
115
115
}
116
116
117
-
void __i915_gem_object_invalidate_frontbuffer(struct drm_i915_gem_object *obj,
117
+
void __i915_gem_object_frontbuffer_invalidate(struct drm_i915_gem_object *obj,
118
118
enum fb_op_origin origin)
119
119
{
120
120
struct i915_frontbuffer *front;
+6
-6
drivers/gpu/drm/i915/gem/i915_gem_object_frontbuffer.h
+6
-6
drivers/gpu/drm/i915/gem/i915_gem_object_frontbuffer.h
···
20
20
struct kref ref;
21
21
};
22
22
23
-
void __i915_gem_object_flush_frontbuffer(struct drm_i915_gem_object *obj,
23
+
void __i915_gem_object_frontbuffer_flush(struct drm_i915_gem_object *obj,
24
24
enum fb_op_origin origin);
25
-
void __i915_gem_object_invalidate_frontbuffer(struct drm_i915_gem_object *obj,
25
+
void __i915_gem_object_frontbuffer_invalidate(struct drm_i915_gem_object *obj,
26
26
enum fb_op_origin origin);
27
27
28
28
static inline void
29
-
i915_gem_object_flush_frontbuffer(struct drm_i915_gem_object *obj,
29
+
i915_gem_object_frontbuffer_flush(struct drm_i915_gem_object *obj,
30
30
enum fb_op_origin origin)
31
31
{
32
32
if (unlikely(rcu_access_pointer(obj->frontbuffer)))
33
-
__i915_gem_object_flush_frontbuffer(obj, origin);
33
+
__i915_gem_object_frontbuffer_flush(obj, origin);
34
34
}
35
35
36
36
static inline void
37
-
i915_gem_object_invalidate_frontbuffer(struct drm_i915_gem_object *obj,
37
+
i915_gem_object_frontbuffer_invalidate(struct drm_i915_gem_object *obj,
38
38
enum fb_op_origin origin)
39
39
{
40
40
if (unlikely(rcu_access_pointer(obj->frontbuffer)))
41
-
__i915_gem_object_invalidate_frontbuffer(obj, origin);
41
+
__i915_gem_object_frontbuffer_invalidate(obj, origin);
42
42
}
43
43
44
44
struct i915_frontbuffer *i915_gem_object_frontbuffer_get(struct drm_i915_gem_object *obj);
+2
-2
drivers/gpu/drm/i915/gem/i915_gem_phys.c
+2
-2
drivers/gpu/drm/i915/gem/i915_gem_phys.c
···
155
155
* We manually control the domain here and pretend that it
156
156
* remains coherent i.e. in the GTT domain, like shmem_pwrite.
157
157
*/
158
-
i915_gem_object_invalidate_frontbuffer(obj, ORIGIN_CPU);
158
+
i915_gem_object_frontbuffer_invalidate(obj, ORIGIN_CPU);
159
159
160
160
if (copy_from_user(vaddr, user_data, args->size))
161
161
return -EFAULT;
···
163
163
drm_clflush_virt_range(vaddr, args->size);
164
164
intel_gt_chipset_flush(to_gt(i915));
165
165
166
-
i915_gem_object_flush_frontbuffer(obj, ORIGIN_CPU);
166
+
i915_gem_object_frontbuffer_flush(obj, ORIGIN_CPU);
167
167
return 0;
168
168
}
169
169
+3
-3
drivers/gpu/drm/i915/i915_gem.c
+3
-3
drivers/gpu/drm/i915/i915_gem.c
···
579
579
goto out_rpm;
580
580
}
581
581
582
-
i915_gem_object_invalidate_frontbuffer(obj, ORIGIN_CPU);
582
+
i915_gem_object_frontbuffer_invalidate(obj, ORIGIN_CPU);
583
583
584
584
user_data = u64_to_user_ptr(args->data_ptr);
585
585
offset = args->offset;
···
626
626
}
627
627
628
628
intel_gt_flush_ggtt_writes(ggtt->vm.gt);
629
-
i915_gem_object_flush_frontbuffer(obj, ORIGIN_CPU);
629
+
i915_gem_object_frontbuffer_flush(obj, ORIGIN_CPU);
630
630
631
631
i915_gem_gtt_cleanup(obj, &node, vma);
632
632
out_rpm:
···
714
714
offset = 0;
715
715
}
716
716
717
-
i915_gem_object_flush_frontbuffer(obj, ORIGIN_CPU);
717
+
i915_gem_object_frontbuffer_flush(obj, ORIGIN_CPU);
718
718
719
719
i915_gem_object_unpin_pages(obj);
720
720
return ret;