github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-06 21:58:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/intel: rename i915_gtt_view* struct/enum to intel_gtt_view*

Browse Source 
Make enum i915_gtt_view_type and struct i915_gtt_view less i915
specific, and rename them enum intel_gtt_view_type and struct
intel_gtt_view, respectively.

$ sed -i 's/i915_gtt_view/intel_gtt_view/g' -- $(git grep -l i915_gtt_view)

Reviewed-by: Maarten Lankhorst <dev@lankhorst.se>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/4ca4ad3d11b0f8167a54d69d6eef0c8a78218c53.1790780340.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
Jani Nikula 2026-09-30 17:59:59 +03:00
parent fe05df7a54
commit 468a755f20
17 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/i915/display/intel_display_types.h
View File

@ -111,7 +111,7 @@ struct intel_fb_view {
* In the normal view the FB object's backing store sg list is used
* directly and hence the remap information here is not used.
*/
struct i915_gtt_view gtt;
struct intel_gtt_view gtt;
/*
* The GTT view (gtt.type) specific information for each FB color

2
drivers/gpu/drm/i915/display/intel_fb.c
View File

@ -1632,7 +1632,7 @@ calc_plane_normal_size(const struct intel_framebuffer *fb, int color_plane,
static void intel_fb_view_init(struct intel_display *display,
struct intel_fb_view *view,
enum i915_gtt_view_type view_type,
enum intel_gtt_view_type view_type,
const struct intel_framebuffer *fb)
{
memset(view, 0, sizeof(*view));

4
drivers/gpu/drm/i915/display/intel_parent.c
View File

@ -94,9 +94,9 @@ void intel_parent_fb_pin_dpt_unpin(struct intel_display *display,
struct i915_vma *intel_parent_fb_pin_reuse_vma(struct intel_display *display,
struct i915_vma *old_ggtt_vma,
struct drm_gem_object *old_obj,
const struct i915_gtt_view *old_view,
const struct intel_gtt_view *old_view,
struct drm_gem_object *new_obj,
const struct i915_gtt_view *new_view,
const struct intel_gtt_view *new_view,
u32 *out_offset)
{
if (!display->parent->fb_pin->reuse_vma)

6
drivers/gpu/drm/i915/display/intel_parent.h
View File

@ -11,12 +11,12 @@ struct dma_fence;
struct drm_file;
struct drm_gem_object;
struct drm_scanout_buffer;
struct i915_gtt_view;
struct i915_vma;
struct intel_display;
struct intel_dpt;
struct intel_fb_pin_params;
struct intel_frontbuffer;
struct intel_gtt_view;
struct intel_hdcp_gsc_context;
struct intel_panic;
struct intel_stolen_node;
@ -53,9 +53,9 @@ void intel_parent_fb_pin_dpt_unpin(struct intel_display *display,
struct i915_vma *intel_parent_fb_pin_reuse_vma(struct intel_display *display,
struct i915_vma *old_ggtt_vma,
struct drm_gem_object *old_obj,
const struct i915_gtt_view *old_view,
const struct intel_gtt_view *old_view,
struct drm_gem_object *new_obj,
const struct i915_gtt_view *new_view,
const struct intel_gtt_view *new_view,
u32 *out_offset);
void intel_parent_fb_pin_get_map(struct intel_display *display,
struct i915_vma *vma, struct iosys_map *map);

2
drivers/gpu/drm/i915/gem/i915_gem_domain.c
View File

@ -421,7 +421,7 @@ struct i915_vma *
i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj,
struct i915_gem_ww_ctx *ww,
u32 alignment, unsigned int guard,
const struct i915_gtt_view *view,
const struct intel_gtt_view *view,
unsigned int flags)
{
struct drm_i915_private *i915 = to_i915(obj->base.dev);

6
drivers/gpu/drm/i915/gem/i915_gem_mman.c
View File

@ -196,12 +196,12 @@ int i915_gem_mmap_gtt_version(void)
return 5;
}
static inline struct i915_gtt_view
static inline struct intel_gtt_view
compute_partial_view(const struct drm_i915_gem_object *obj,
pgoff_t page_offset,
unsigned int chunk)
{
struct i915_gtt_view view;
struct intel_gtt_view view;
if (i915_gem_object_is_tiled(obj))
chunk = roundup(chunk, tile_row_pages(obj) ?: 1);
@ -391,7 +391,7 @@ static vm_fault_t vm_fault_gtt(struct vm_fault *vmf)
PIN_NOEVICT);
if (IS_ERR(vma) && vma != ERR_PTR(-EDEADLK)) {
/* Use a partial view if it is bigger than available space */
struct i915_gtt_view view =
struct intel_gtt_view view =
compute_partial_view(obj, page_offset, MIN_CHUNK_PAGES);
unsigned int flags;

2
drivers/gpu/drm/i915/gem/i915_gem_object.h
View File

@ -776,7 +776,7 @@ struct i915_vma * __must_check
i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj,
struct i915_gem_ww_ctx *ww,
u32 alignment, unsigned int guard,
const struct i915_gtt_view *view,
const struct intel_gtt_view *view,
unsigned int flags);
void i915_gem_object_make_unshrinkable(struct drm_i915_gem_object *obj);

4
drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
View File

@ -97,7 +97,7 @@ static int check_partial_mapping(struct drm_i915_gem_object *obj,
{
const unsigned long npages = obj->base.size / PAGE_SIZE;
struct drm_i915_private *i915 = to_i915(obj->base.dev);
struct i915_gtt_view view;
struct intel_gtt_view view;
struct i915_vma *vma;
unsigned long offset;
unsigned long page;
@ -214,7 +214,7 @@ static int check_partial_mappings(struct drm_i915_gem_object *obj,
}
for_each_prime_number_from(page, 1, npages) {
struct i915_gtt_view view =
struct intel_gtt_view view =
compute_partial_view(obj, page, MIN_CHUNK_PAGES);
unsigned long offset;
u32 __iomem *io;

4
drivers/gpu/drm/i915/i915_gem.c
View File

@ -902,7 +902,7 @@ static void discard_ggtt_vma(struct i915_vma *vma)
struct i915_vma *
i915_gem_object_ggtt_pin_ww(struct drm_i915_gem_object *obj,
struct i915_gem_ww_ctx *ww,
const struct i915_gtt_view *view,
const struct intel_gtt_view *view,
u64 size, u64 alignment, u64 flags)
{
struct drm_i915_private *i915 = to_i915(obj->base.dev);
@ -1004,7 +1004,7 @@ i915_gem_object_ggtt_pin_ww(struct drm_i915_gem_object *obj,
struct i915_vma * __must_check
i915_gem_object_ggtt_pin(struct drm_i915_gem_object *obj,
const struct i915_gtt_view *view,
const struct intel_gtt_view *view,
u64 size, u64 alignment, u64 flags)
{
struct i915_gem_ww_ctx ww;

6
drivers/gpu/drm/i915/i915_gem.h
View File

@ -36,8 +36,8 @@ struct drm_file;
struct drm_i915_gem_object;
struct drm_i915_private;
struct i915_gem_ww_ctx;
struct i915_gtt_view;
struct i915_vma;
struct intel_gtt_view;
#define I915_GEM_GPU_DOMAINS \
(I915_GEM_DOMAIN_RENDER | \
@ -55,12 +55,12 @@ void i915_gem_drain_workqueue(struct drm_i915_private *i915);
struct i915_vma * __must_check
i915_gem_object_ggtt_pin_ww(struct drm_i915_gem_object *obj,
struct i915_gem_ww_ctx *ww,
const struct i915_gtt_view *view,
const struct intel_gtt_view *view,
u64 size, u64 alignment, u64 flags);
struct i915_vma * __must_check
i915_gem_object_ggtt_pin(struct drm_i915_gem_object *obj,
const struct i915_gtt_view *view,
const struct intel_gtt_view *view,
u64 size, u64 alignment, u64 flags);
int i915_gem_object_unbind(struct drm_i915_gem_object *obj,

8
drivers/gpu/drm/i915/i915_vma.c
View File

@ -147,7 +147,7 @@ static void __i915_vma_retire(struct i915_active *ref)
static struct i915_vma *
vma_create(struct drm_i915_gem_object *obj,
struct i915_address_space *vm,
const struct i915_gtt_view *view)
const struct intel_gtt_view *view)
{
struct i915_vma *pos = ERR_PTR(-E2BIG);
struct i915_vma *vma;
@ -286,7 +286,7 @@ vma_create(struct drm_i915_gem_object *obj,
static struct i915_vma *
i915_vma_lookup(struct drm_i915_gem_object *obj,
struct i915_address_space *vm,
const struct i915_gtt_view *view)
const struct intel_gtt_view *view)
{
struct rb_node *rb;
@ -324,7 +324,7 @@ i915_vma_lookup(struct drm_i915_gem_object *obj,
struct i915_vma *
i915_vma_instance(struct drm_i915_gem_object *obj,
struct i915_address_space *vm,
const struct i915_gtt_view *view)
const struct intel_gtt_view *view)
{
struct i915_vma *vma;
@ -1267,7 +1267,7 @@ intel_remap_pages(struct intel_remapped_info *rem_info,
}
static noinline struct sg_table *
intel_partial_pages(const struct i915_gtt_view *view,
intel_partial_pages(const struct intel_gtt_view *view,
struct drm_i915_gem_object *obj)
{
struct sg_table *st;

4
drivers/gpu/drm/i915/i915_vma.h
View File

@ -43,7 +43,7 @@
struct i915_vma *
i915_vma_instance(struct drm_i915_gem_object *obj,
struct i915_address_space *vm,
const struct i915_gtt_view *view);
const struct intel_gtt_view *view);
void i915_vma_unpin_and_release(struct i915_vma **p_vma, unsigned int flags);
#define I915_VMA_RELEASE_MAP BIT(0)
@ -207,7 +207,7 @@ static inline void i915_vma_put(struct i915_vma *vma)
static inline long
i915_vma_compare(struct i915_vma *vma,
struct i915_address_space *vm,
const struct i915_gtt_view *view)
const struct intel_gtt_view *view)
{
ptrdiff_t cmp;

16
drivers/gpu/drm/i915/i915_vma_types.h
View File

@ -66,22 +66,22 @@
* Implementation and usage
*
* GGTT views are implemented using VMAs and are distinguished via enum
* i915_gtt_view_type and struct i915_gtt_view.
* intel_gtt_view_type and struct intel_gtt_view.
*
* A new flavour of core GEM functions which work with GGTT bound objects were
* added with the _ggtt_ infix, and sometimes with _view postfix to avoid
* renaming in large amounts of code. They take the struct i915_gtt_view
* renaming in large amounts of code. They take the struct intel_gtt_view
* parameter encapsulating all metadata required to implement a view.
*
* As a helper for callers which are only interested in the normal view,
* globally const i915_gtt_view_normal singleton instance exists. All old core
* globally const intel_gtt_view_normal singleton instance exists. All old core
* GEM API functions, the ones not taking the view parameter, are operating on,
* or with the normal GGTT view.
*
* Code wanting to add or use a new GGTT view needs to:
*
* 1. Add a new enum with a suitable name.
* 2. Extend the metadata in the i915_gtt_view structure if required.
* 2. Extend the metadata in the intel_gtt_view structure if required.
* 3. Add support to i915_get_vma_pages().
*
* New views are required to build a scatter-gather table from within the
@ -89,7 +89,7 @@
* exists for the lifetime of an VMA.
*
* Core API is designed to have copy semantics which means that passed in
* struct i915_gtt_view does not need to be persistent (left around after
* struct intel_gtt_view does not need to be persistent (left around after
* calling the core API functions).
*
*/
@ -111,7 +111,7 @@ static inline void assert_i915_gem_gtt_types(void)
/* As we encode the size of each branch inside the union into its type,
* we have to be careful that each branch has a unique size.
*/
switch ((enum i915_gtt_view_type)0) {
switch ((enum intel_gtt_view_type)0) {
case I915_GTT_VIEW_NORMAL:
case I915_GTT_VIEW_PARTIAL:
case I915_GTT_VIEW_ROTATED:
@ -230,11 +230,11 @@ struct i915_vma {
/**
* Support different GGTT views into the same object.
* This means there can be multiple VMA mappings per object and per VM.
* i915_gtt_view_type is used to distinguish between those entries.
* intel_gtt_view_type is used to distinguish between those entries.
* The default one of zero (I915_GTT_VIEW_NORMAL) is default and also
* assumed in GEM functions which take no ggtt view parameter.
*/
struct i915_gtt_view gtt_view;
struct intel_gtt_view gtt_view;
/** This object's place on the active/inactive lists */
struct list_head vm_link;

16
drivers/gpu/drm/i915/selftests/i915_vma.c
View File

@ -63,7 +63,7 @@ static bool assert_vma(struct i915_vma *vma,
static struct i915_vma *
checked_vma_instance(struct drm_i915_gem_object *obj,
struct i915_address_space *vm,
const struct i915_gtt_view *view)
const struct intel_gtt_view *view)
{
struct i915_vma *vma;
bool ok = true;
@ -533,7 +533,7 @@ assert_remapped(struct drm_i915_gem_object *obj,
return sg;
}
static unsigned int remapped_size(enum i915_gtt_view_type view_type,
static unsigned int remapped_size(enum intel_gtt_view_type view_type,
const struct intel_remapped_plane_info *a,
const struct intel_remapped_plane_info *b)
{
@ -572,7 +572,7 @@ static int igt_vma_rotate_remap(void *arg)
{ }
}, *a, *b;
enum i915_gtt_view_type types[] = {
enum intel_gtt_view_type types[] = {
I915_GTT_VIEW_ROTATED,
I915_GTT_VIEW_REMAPPED,
0,
@ -592,7 +592,7 @@ static int igt_vma_rotate_remap(void *arg)
for (t = types; *t; t++) {
for (a = planes; a->width; a++) {
for (b = planes + ARRAY_SIZE(planes); b-- != planes; ) {
struct i915_gtt_view view = {
struct intel_gtt_view view = {
.type = *t,
.remapped.plane[0] = *a,
.remapped.plane[1] = *b,
@ -745,7 +745,7 @@ static bool assert_partial(struct drm_i915_gem_object *obj,
}
static bool assert_pin(struct i915_vma *vma,
struct i915_gtt_view *view,
struct intel_gtt_view *view,
u64 size,
const char *name)
{
@ -823,7 +823,7 @@ static int igt_vma_partial(void *arg)
nvma = 0;
for_each_prime_number_from(sz, 1, npages) {
for_each_prime_number_from(offset, 0, npages - sz) {
struct i915_gtt_view view;
struct intel_gtt_view view;
view.type = I915_GTT_VIEW_PARTIAL;
view.partial.offset = offset;
@ -981,7 +981,7 @@ static int igt_vma_remapped_gtt(void *arg)
{ }
}, *p;
enum i915_gtt_view_type types[] = {
enum intel_gtt_view_type types[] = {
I915_GTT_VIEW_ROTATED,
I915_GTT_VIEW_REMAPPED,
0,
@ -1001,7 +1001,7 @@ static int igt_vma_remapped_gtt(void *arg)
for (t = types; *t; t++) {
for (p = planes; p->width; p++) {
struct i915_gtt_view view = {
struct intel_gtt_view view = {
.type = *t,
.rotated.plane[0] = *p,
};

10
drivers/gpu/drm/xe/display/xe_fb_pin.c
View File

@ -148,7 +148,7 @@ static int __xe_pin_fb_vma_dpt(struct drm_gem_object *obj,
struct xe_device *xe = to_xe_device(obj->dev);
struct xe_tile *tile0 = xe_device_get_root_tile(xe);
struct xe_ggtt *ggtt = tile0->mem.ggtt;
const struct i915_gtt_view *view = pin_params->view;
const struct intel_gtt_view *view = pin_params->view;
struct xe_bo *bo = gem_to_xe_bo(obj), *dpt;
u32 dpt_size, size = bo->ttm.base.size;
@ -231,7 +231,7 @@ write_ggtt_rotated(struct xe_ggtt *ggtt, u32 *ggtt_ofs,
}
struct fb_rotate_args {
const struct i915_gtt_view *view;
const struct intel_gtt_view *view;
struct xe_bo *bo;
};
@ -256,7 +256,7 @@ static int __xe_pin_fb_vma_ggtt(struct drm_gem_object *obj,
const struct intel_fb_pin_params *pin_params,
struct i915_vma *vma)
{
const struct i915_gtt_view *view = pin_params->view;
const struct intel_gtt_view *view = pin_params->view;
struct xe_bo *bo = gem_to_xe_bo(obj);
struct xe_device *xe = to_xe_device(obj->dev);
struct xe_tile *tile0 = xe_device_get_root_tile(xe);
@ -457,9 +457,9 @@ static void xe_fb_pin_dpt_unpin(struct intel_dpt *dpt,
static struct i915_vma *
xe_fb_pin_reuse_vma(struct i915_vma *old_ggtt_vma,
struct drm_gem_object *old_obj,
const struct i915_gtt_view *old_view,
const struct intel_gtt_view *old_view,
struct drm_gem_object *new_obj,
const struct i915_gtt_view *new_view,
const struct intel_gtt_view *new_view,
u32 *out_offset)
{
if (old_ggtt_vma && old_obj == new_obj &&

8
include/drm/intel/display_parent_interface.h
View File

@ -16,11 +16,11 @@ struct drm_mode_fb_cmd2;
struct drm_plane_state;
struct drm_scanout_buffer;
struct fb_info;
struct i915_gtt_view;
struct i915_vma;
struct intel_dpt;
struct intel_dsb_buffer;
struct intel_frontbuffer;
struct intel_gtt_view;
struct intel_hdcp_gsc_context;
struct intel_initial_plane_config;
struct intel_panic;
@ -31,7 +31,7 @@ struct seq_file;
struct vm_area_struct;
struct intel_fb_pin_params {
const struct i915_gtt_view *view;
const struct intel_gtt_view *view;
unsigned int alignment;
unsigned int phys_alignment;
unsigned int vtd_guard;
@ -101,9 +101,9 @@ struct intel_display_fb_pin_interface {
struct i915_vma *ggtt_vma);
struct i915_vma *(*reuse_vma)(struct i915_vma *old_ggtt_vma,
struct drm_gem_object *old_obj,
const struct i915_gtt_view *old_view,
const struct intel_gtt_view *old_view,
struct drm_gem_object *new_obj,
const struct i915_gtt_view *new_view,
const struct intel_gtt_view *new_view,
u32 *out_offset);
void (*get_map)(struct i915_vma *vma, struct iosys_map *map);
};

12
include/drm/intel/gtt_view_types.h
View File

@ -39,15 +39,15 @@ struct intel_remapped_info {
u32 plane_alignment;
} __packed;
enum i915_gtt_view_type {
enum intel_gtt_view_type {
I915_GTT_VIEW_NORMAL = 0,
I915_GTT_VIEW_ROTATED = sizeof(struct intel_rotation_info),
I915_GTT_VIEW_PARTIAL = sizeof(struct intel_partial_info),
I915_GTT_VIEW_REMAPPED = sizeof(struct intel_remapped_info),
};
struct i915_gtt_view {
enum i915_gtt_view_type type;
struct intel_gtt_view {
enum intel_gtt_view_type type;
union {
/* Members need to contain no holes/padding */
struct intel_partial_info partial;
@ -56,17 +56,17 @@ struct i915_gtt_view {
};
};
static inline bool intel_gtt_view_is_normal(const struct i915_gtt_view *view)
static inline bool intel_gtt_view_is_normal(const struct intel_gtt_view *view)
{
return view->type == I915_GTT_VIEW_NORMAL;
}
static inline bool intel_gtt_view_is_remapped(const struct i915_gtt_view *view)
static inline bool intel_gtt_view_is_remapped(const struct intel_gtt_view *view)
{
return view->type == I915_GTT_VIEW_REMAPPED;
}
static inline bool intel_gtt_view_is_rotated(const struct i915_gtt_view *view)
static inline bool intel_gtt_view_is_rotated(const struct intel_gtt_view *view)
{
return view->type == I915_GTT_VIEW_ROTATED;
}