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

drm/intel: rename I915_GTT_VIEW_* enumerations to INTEL_GTT_VIEW_*

Browse Source 
Make the I915_GTT_VIEW_* enumerators less i915 specific, and rename them
INTEL_GTT_VIEW_*.

$ 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/6e66fd6b61e361ffde316e5399baf9432383ced5.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 18:00:06 +03:00
parent 105852cba4
commit 2c1bb96681
6 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1706,7 +1706,7 @@ int intel_fill_fb_info(struct intel_display *display, struct intel_framebuffer *
unsigned int tile_size = intel_tile_size(display);
intel_fb_view_init(display, &fb->normal_view,
I915_GTT_VIEW_NORMAL, fb);
INTEL_GTT_VIEW_NORMAL, fb);
drm_WARN_ON(display->drm,
intel_fb_supports_90_270_rotation(fb) &&
@ -1714,10 +1714,10 @@ int intel_fill_fb_info(struct intel_display *display, struct intel_framebuffer *
if (intel_fb_supports_90_270_rotation(fb))
intel_fb_view_init(display, &fb->rotated_view,
I915_GTT_VIEW_ROTATED, fb);
INTEL_GTT_VIEW_ROTATED, fb);
if (intel_fb_needs_pot_stride_remap(fb))
intel_fb_view_init(display, &fb->remapped_view,
I915_GTT_VIEW_REMAPPED, fb);
INTEL_GTT_VIEW_REMAPPED, fb);
for (i = 0; i < num_planes; i++) {
struct fb_plane_view_dims view_dims;
@ -1845,7 +1845,7 @@ static void intel_plane_remap_gtt(struct intel_plane_state *plane_state)
intel_fb_view_init(display, &plane_state->view,
drm_rotation_90_or_270(rotation) ?
I915_GTT_VIEW_ROTATED : I915_GTT_VIEW_REMAPPED,
INTEL_GTT_VIEW_ROTATED : INTEL_GTT_VIEW_REMAPPED,
intel_fb);
src_x = plane_state->uapi.src.x1 >> 16;

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

@ -206,7 +206,7 @@ compute_partial_view(const struct drm_i915_gem_object *obj,
if (i915_gem_object_is_tiled(obj))
chunk = roundup(chunk, tile_row_pages(obj) ?: 1);
view.type = I915_GTT_VIEW_PARTIAL;
view.type = INTEL_GTT_VIEW_PARTIAL;
view.partial.offset = rounddown(page_offset, chunk);
view.partial.size =
min_t(unsigned int, chunk,
@ -214,7 +214,7 @@ compute_partial_view(const struct drm_i915_gem_object *obj,
/* If the partial covers the entire object, just create a normal VMA. */
if (chunk >= obj->base.size >> PAGE_SHIFT)
view.type = I915_GTT_VIEW_NORMAL;
view.type = INTEL_GTT_VIEW_NORMAL;
return view;
}
@ -407,7 +407,7 @@ static vm_fault_t vm_fault_gtt(struct vm_fault *vmf)
vma = i915_gem_object_ggtt_pin_ww(obj, &ww, &view, 0, 0, flags);
if (IS_ERR(vma) && vma != ERR_PTR(-EDEADLK)) {
flags = PIN_MAPPABLE;
view.type = I915_GTT_VIEW_PARTIAL;
view.type = INTEL_GTT_VIEW_PARTIAL;
vma = i915_gem_object_ggtt_pin_ww(obj, &ww, &view, 0, 0, flags);
}

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

@ -217,7 +217,7 @@ i915_vma_compare(struct i915_vma *vma,
if (cmp)
return cmp;
BUILD_BUG_ON(I915_GTT_VIEW_NORMAL != 0);
BUILD_BUG_ON(INTEL_GTT_VIEW_NORMAL != 0);
cmp = vma->gtt_view.type;
if (!view)
return cmp;
@ -238,9 +238,9 @@ i915_vma_compare(struct i915_vma *vma,
* we assert above that all branches have the same address, and that
* each branch has a unique type/size.
*/
BUILD_BUG_ON(I915_GTT_VIEW_NORMAL >= I915_GTT_VIEW_PARTIAL);
BUILD_BUG_ON(I915_GTT_VIEW_PARTIAL >= I915_GTT_VIEW_ROTATED);
BUILD_BUG_ON(I915_GTT_VIEW_ROTATED >= I915_GTT_VIEW_REMAPPED);
BUILD_BUG_ON(INTEL_GTT_VIEW_NORMAL >= INTEL_GTT_VIEW_PARTIAL);
BUILD_BUG_ON(INTEL_GTT_VIEW_PARTIAL >= INTEL_GTT_VIEW_ROTATED);
BUILD_BUG_ON(INTEL_GTT_VIEW_ROTATED >= INTEL_GTT_VIEW_REMAPPED);
BUILD_BUG_ON(offsetof(typeof(*view), rotated) !=
offsetof(typeof(*view), partial));
BUILD_BUG_ON(offsetof(typeof(*view), rotated) !=

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

@ -112,10 +112,10 @@ static inline void assert_i915_gem_gtt_types(void)
* we have to be careful that each branch has a unique size.
*/
switch ((enum intel_gtt_view_type)0) {
case I915_GTT_VIEW_NORMAL:
case I915_GTT_VIEW_PARTIAL:
case I915_GTT_VIEW_ROTATED:
case I915_GTT_VIEW_REMAPPED:
case INTEL_GTT_VIEW_NORMAL:
case INTEL_GTT_VIEW_PARTIAL:
case INTEL_GTT_VIEW_ROTATED:
case INTEL_GTT_VIEW_REMAPPED:
/* gcc complains if these are identical cases */
break;
}
@ -231,7 +231,7 @@ struct i915_vma {
* Support different GGTT views into the same object.
* This means there can be multiple VMA mappings per object and per VM.
* intel_gtt_view_type is used to distinguish between those entries.
* The default one of zero (I915_GTT_VIEW_NORMAL) is default and also
* The default one of zero (INTEL_GTT_VIEW_NORMAL) is default and also
* assumed in GEM functions which take no ggtt view parameter.
*/
struct intel_gtt_view gtt_view;

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

@ -573,8 +573,8 @@ static int igt_vma_rotate_remap(void *arg)
{ }
}, *a, *b;
enum intel_gtt_view_type types[] = {
I915_GTT_VIEW_ROTATED,
I915_GTT_VIEW_REMAPPED,
INTEL_GTT_VIEW_ROTATED,
INTEL_GTT_VIEW_REMAPPED,
0,
}, *t;
const unsigned int max_pages = 64;
@ -825,12 +825,12 @@ static int igt_vma_partial(void *arg)
for_each_prime_number_from(offset, 0, npages - sz) {
struct intel_gtt_view view;
view.type = I915_GTT_VIEW_PARTIAL;
view.type = INTEL_GTT_VIEW_PARTIAL;
view.partial.offset = offset;
view.partial.size = sz;
if (sz == npages)
view.type = I915_GTT_VIEW_NORMAL;
view.type = INTEL_GTT_VIEW_NORMAL;
vma = checked_vma_instance(obj, vm, &view);
if (IS_ERR(vma)) {
@ -982,8 +982,8 @@ static int igt_vma_remapped_gtt(void *arg)
{ }
}, *p;
enum intel_gtt_view_type types[] = {
I915_GTT_VIEW_ROTATED,
I915_GTT_VIEW_REMAPPED,
INTEL_GTT_VIEW_ROTATED,
INTEL_GTT_VIEW_REMAPPED,
0,
}, *t;
struct drm_i915_gem_object *obj;

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

@ -40,10 +40,10 @@ struct intel_remapped_info {
} __packed;
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),
INTEL_GTT_VIEW_NORMAL = 0,
INTEL_GTT_VIEW_ROTATED = sizeof(struct intel_rotation_info),
INTEL_GTT_VIEW_PARTIAL = sizeof(struct intel_partial_info),
INTEL_GTT_VIEW_REMAPPED = sizeof(struct intel_remapped_info),
};
struct intel_gtt_view {
@ -58,22 +58,22 @@ struct intel_gtt_view {
static inline bool intel_gtt_view_is_normal(const struct intel_gtt_view *view)
{
return view->type == I915_GTT_VIEW_NORMAL;
return view->type == INTEL_GTT_VIEW_NORMAL;
}
static inline bool intel_gtt_view_is_remapped(const struct intel_gtt_view *view)
{
return view->type == I915_GTT_VIEW_REMAPPED;
return view->type == INTEL_GTT_VIEW_REMAPPED;
}
static inline bool intel_gtt_view_is_rotated(const struct intel_gtt_view *view)
{
return view->type == I915_GTT_VIEW_ROTATED;
return view->type == INTEL_GTT_VIEW_ROTATED;
}
static inline bool intel_gtt_view_is_partial(const struct intel_gtt_view *view)
{
return view->type == I915_GTT_VIEW_PARTIAL;
return view->type == INTEL_GTT_VIEW_PARTIAL;
}
#endif /* __DRM_INTEL_GTT_VIEW_TYPES_H__ */