Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/i915/dpt: rename struct i915_dpt to intel_dpt
Rename struct i915_dpt to intel_dpt. This may seem rather inconsistent
considering we just renamed the functions the other way round, but the
intent here is to lift struct intel_dpt to the display parent interface
as the generic opaque type for DPT instead of the very specific struct
i915_address_space.
Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Link: https://patch.msgid.link/afb89dcce35c5b0cff2007b58d6ee20fd3200c24.1772030909.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+11
-11
+11
-11
drivers/gpu/drm/i915/i915_dpt.c
+11
-11
drivers/gpu/drm/i915/i915_dpt.c
···
15
15
#include "i915_dpt.h"
16
16
#include "i915_drv.h"
17
17
18
-
struct i915_dpt {
18
+
struct intel_dpt {
19
19
struct i915_address_space vm;
20
20
21
21
struct drm_i915_gem_object *obj;
···
25
25
26
26
#define i915_is_dpt(vm) ((vm)->is_dpt)
27
27
28
-
static inline struct i915_dpt *
28
+
static inline struct intel_dpt *
29
29
i915_vm_to_dpt(struct i915_address_space *vm)
30
30
{
31
-
BUILD_BUG_ON(offsetof(struct i915_dpt, vm));
31
+
BUILD_BUG_ON(offsetof(struct intel_dpt, vm));
32
32
drm_WARN_ON(&vm->i915->drm, !i915_is_dpt(vm));
33
-
return container_of(vm, struct i915_dpt, vm);
33
+
return container_of(vm, struct intel_dpt, vm);
34
34
}
35
35
36
36
static void gen8_set_pte(void __iomem *addr, gen8_pte_t pte)
···
44
44
unsigned int pat_index,
45
45
u32 flags)
46
46
{
47
-
struct i915_dpt *dpt = i915_vm_to_dpt(vm);
47
+
struct intel_dpt *dpt = i915_vm_to_dpt(vm);
48
48
gen8_pte_t __iomem *base = dpt->iomem;
49
49
50
50
gen8_set_pte(base + offset / I915_GTT_PAGE_SIZE,
···
56
56
unsigned int pat_index,
57
57
u32 flags)
58
58
{
59
-
struct i915_dpt *dpt = i915_vm_to_dpt(vm);
59
+
struct intel_dpt *dpt = i915_vm_to_dpt(vm);
60
60
gen8_pte_t __iomem *base = dpt->iomem;
61
61
const gen8_pte_t pte_encode = vm->pte_encode(0, pat_index, flags);
62
62
struct sgt_iter sgt_iter;
···
116
116
117
117
static void dpt_cleanup(struct i915_address_space *vm)
118
118
{
119
-
struct i915_dpt *dpt = i915_vm_to_dpt(vm);
119
+
struct intel_dpt *dpt = i915_vm_to_dpt(vm);
120
120
121
121
i915_gem_object_put(dpt->obj);
122
122
}
···
125
125
{
126
126
struct drm_i915_private *i915 = vm->i915;
127
127
struct intel_display *display = i915->display;
128
-
struct i915_dpt *dpt = i915_vm_to_dpt(vm);
128
+
struct intel_dpt *dpt = i915_vm_to_dpt(vm);
129
129
struct ref_tracker *wakeref;
130
130
struct i915_vma *vma;
131
131
void __iomem *iomem;
···
175
175
176
176
void i915_dpt_unpin_from_ggtt(struct i915_address_space *vm)
177
177
{
178
-
struct i915_dpt *dpt = i915_vm_to_dpt(vm);
178
+
struct intel_dpt *dpt = i915_vm_to_dpt(vm);
179
179
180
180
i915_vma_unpin_iomap(dpt->vma);
181
181
i915_vma_put(dpt->vma);
···
186
186
struct drm_i915_private *i915 = to_i915(obj->dev);
187
187
struct drm_i915_gem_object *dpt_obj;
188
188
struct i915_address_space *vm;
189
-
struct i915_dpt *dpt;
189
+
struct intel_dpt *dpt;
190
190
int ret;
191
191
192
192
if (!size)
···
248
248
249
249
static void i915_dpt_destroy(struct i915_address_space *vm)
250
250
{
251
-
struct i915_dpt *dpt = i915_vm_to_dpt(vm);
251
+
struct intel_dpt *dpt = i915_vm_to_dpt(vm);
252
252
253
253
dpt->obj->is_dpt = false;
254
254
i915_vm_put(&dpt->vm);