Skip to content

L
linux
Commit 6d80f430 authored by Imre Deak's avatar Imre Deak
Browse files
Options

drm/i915: s/stride/src_stride/ in the intel_remapped_plane_info struct 

An upcoming patch adds a new dst_stride field to the
intel_remapped_plane_info struct, so for clarity rename the current
stride field to src_stride.
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210325214808.2071517-23-imre.deak@intel.com
parent b05787ae
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 41 deletions
drivers/gpu/drm/i915/display/intel_fb.c
View file @ 6d80f430
...@@ -590,8 +590,8 @@ static void init_plane_view_dims(const struct intel_framebuffer *fb, int color_p ...@@ -590,8 +590,8 @@ static void init_plane_view_dims(const struct intel_framebuffer *fb, int color_p
} }
static unsigned int static unsigned int
plane_view_stride_tiles(const struct intel_framebuffer *fb, int color_plane, plane_view_src_stride_tiles(const struct intel_framebuffer *fb, int color_plane,
const struct fb_plane_view_dims *dims) const struct fb_plane_view_dims *dims)
{ {
return DIV_ROUND_UP(fb->base.pitches[color_plane], return DIV_ROUND_UP(fb->base.pitches[color_plane],
dims->tile_width * fb->base.format->cpp[color_plane]); dims->tile_width * fb->base.format->cpp[color_plane]);
...@@ -633,7 +633,7 @@ static u32 calc_plane_remap_info(const struct intel_framebuffer *fb, int color_p ...@@ -633,7 +633,7 @@ static u32 calc_plane_remap_info(const struct intel_framebuffer *fb, int color_p
struct drm_rect r; struct drm_rect r;
assign_chk_ovf(i915, remap_info->offset, obj_offset); assign_chk_ovf(i915, remap_info->offset, obj_offset);
assign_chk_ovf(i915, remap_info->stride, plane_view_stride_tiles(fb, color_plane, dims)); assign_chk_ovf(i915, remap_info->src_stride, plane_view_src_stride_tiles(fb, color_plane, dims));
assign_chk_ovf(i915, remap_info->width, plane_view_width_tiles(fb, color_plane, dims, x)); assign_chk_ovf(i915, remap_info->width, plane_view_width_tiles(fb, color_plane, dims, x));
assign_chk_ovf(i915, remap_info->height, plane_view_height_tiles(fb, color_plane, dims, y)); assign_chk_ovf(i915, remap_info->height, plane_view_height_tiles(fb, color_plane, dims, y));
...@@ -699,7 +699,7 @@ calc_plane_normal_size(const struct intel_framebuffer *fb, int color_plane, ...@@ -699,7 +699,7 @@ calc_plane_normal_size(const struct intel_framebuffer *fb, int color_plane,
x * fb->base.format->cpp[color_plane]; x * fb->base.format->cpp[color_plane];
tiles = DIV_ROUND_UP(size, intel_tile_size(i915)); tiles = DIV_ROUND_UP(size, intel_tile_size(i915));
} else { } else {
tiles = plane_view_stride_tiles(fb, color_plane, dims) * tiles = plane_view_src_stride_tiles(fb, color_plane, dims) *
plane_view_height_tiles(fb, color_plane, dims, y); plane_view_height_tiles(fb, color_plane, dims, y);
/* /*
* If the plane isn't horizontally tile aligned, * If the plane isn't horizontally tile aligned,
......
drivers/gpu/drm/i915/gt/intel_ggtt.c
View file @ 6d80f430
...@@ -1300,7 +1300,7 @@ intel_rotate_pages(struct intel_rotation_info *rot_info, ...@@ -1300,7 +1300,7 @@ intel_rotate_pages(struct intel_rotation_info *rot_info,
for (i = 0 ; i < ARRAY_SIZE(rot_info->plane); i++) { for (i = 0 ; i < ARRAY_SIZE(rot_info->plane); i++) {
sg = rotate_pages(obj, rot_info->plane[i].offset, sg = rotate_pages(obj, rot_info->plane[i].offset,
rot_info->plane[i].width, rot_info->plane[i].height, rot_info->plane[i].width, rot_info->plane[i].height,
rot_info->plane[i].stride, st, sg); rot_info->plane[i].src_stride, st, sg);
} }
return st; return st;
...@@ -1384,7 +1384,7 @@ intel_remap_pages(struct intel_remapped_info *rem_info, ...@@ -1384,7 +1384,7 @@ intel_remap_pages(struct intel_remapped_info *rem_info,
for (i = 0 ; i < ARRAY_SIZE(rem_info->plane); i++) { for (i = 0 ; i < ARRAY_SIZE(rem_info->plane); i++) {
sg = remap_pages(obj, rem_info->plane[i].offset, sg = remap_pages(obj, rem_info->plane[i].offset,
rem_info->plane[i].width, rem_info->plane[i].height, rem_info->plane[i].width, rem_info->plane[i].height,
rem_info->plane[i].stride, st, sg); rem_info->plane[i].src_stride, st, sg);
} }
i915_sg_trim(st); i915_sg_trim(st);
......
drivers/gpu/drm/i915/i915_debugfs.c
View file @ 6d80f430
...@@ -176,11 +176,11 @@ i915_debugfs_describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) ...@@ -176,11 +176,11 @@ i915_debugfs_describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj)
seq_printf(m, ", rotated [(%ux%u, stride=%u, offset=%u), (%ux%u, stride=%u, offset=%u)]", seq_printf(m, ", rotated [(%ux%u, stride=%u, offset=%u), (%ux%u, stride=%u, offset=%u)]",
vma->ggtt_view.rotated.plane[0].width, vma->ggtt_view.rotated.plane[0].width,
vma->ggtt_view.rotated.plane[0].height, vma->ggtt_view.rotated.plane[0].height,
vma->ggtt_view.rotated.plane[0].stride, vma->ggtt_view.rotated.plane[0].src_stride,
vma->ggtt_view.rotated.plane[0].offset, vma->ggtt_view.rotated.plane[0].offset,
vma->ggtt_view.rotated.plane[1].width, vma->ggtt_view.rotated.plane[1].width,
vma->ggtt_view.rotated.plane[1].height, vma->ggtt_view.rotated.plane[1].height,
vma->ggtt_view.rotated.plane[1].stride, vma->ggtt_view.rotated.plane[1].src_stride,
vma->ggtt_view.rotated.plane[1].offset); vma->ggtt_view.rotated.plane[1].offset);
break; break;
...@@ -188,11 +188,11 @@ i915_debugfs_describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) ...@@ -188,11 +188,11 @@ i915_debugfs_describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj)
seq_printf(m, ", remapped [(%ux%u, stride=%u, offset=%u), (%ux%u, stride=%u, offset=%u)]", seq_printf(m, ", remapped [(%ux%u, stride=%u, offset=%u), (%ux%u, stride=%u, offset=%u)]",
vma->ggtt_view.remapped.plane[0].width, vma->ggtt_view.remapped.plane[0].width,
vma->ggtt_view.remapped.plane[0].height, vma->ggtt_view.remapped.plane[0].height,
vma->ggtt_view.remapped.plane[0].stride, vma->ggtt_view.remapped.plane[0].src_stride,
vma->ggtt_view.remapped.plane[0].offset, vma->ggtt_view.remapped.plane[0].offset,
vma->ggtt_view.remapped.plane[1].width, vma->ggtt_view.remapped.plane[1].width,
vma->ggtt_view.remapped.plane[1].height, vma->ggtt_view.remapped.plane[1].height,
vma->ggtt_view.remapped.plane[1].stride, vma->ggtt_view.remapped.plane[1].src_stride,
vma->ggtt_view.remapped.plane[1].offset); vma->ggtt_view.remapped.plane[1].offset);
break; break;
......
drivers/gpu/drm/i915/i915_vma_types.h
View file @ 6d80f430
...@@ -100,7 +100,7 @@ struct intel_remapped_plane_info { ...@@ -100,7 +100,7 @@ struct intel_remapped_plane_info {
u32 offset; u32 offset;
u16 width; u16 width;
u16 height; u16 height;
u16 stride; u16 src_stride;
u16 unused_mbz; u16 unused_mbz;
} __packed; } __packed;
......
drivers/gpu/drm/i915/selftests/i915_vma.c
View file @ 6d80f430
...@@ -361,7 +361,7 @@ static unsigned long rotated_index(const struct intel_rotation_info *r, ...@@ -361,7 +361,7 @@ static unsigned long rotated_index(const struct intel_rotation_info *r,
unsigned int x, unsigned int x,
unsigned int y) unsigned int y)
{ {
return (r->plane[n].stride * (r->plane[n].height - y - 1) + return (r->plane[n].src_stride * (r->plane[n].height - y - 1) +
r->plane[n].offset + x); r->plane[n].offset + x);
} }
...@@ -411,7 +411,7 @@ static unsigned long remapped_index(const struct intel_remapped_info *r, ...@@ -411,7 +411,7 @@ static unsigned long remapped_index(const struct intel_remapped_info *r,
unsigned int x, unsigned int x,
unsigned int y) unsigned int y)
{ {
return (r->plane[n].stride * y + return (r->plane[n].src_stride * y +
r->plane[n].offset + x); r->plane[n].offset + x);
} }
...@@ -479,21 +479,21 @@ static int igt_vma_rotate_remap(void *arg) ...@@ -479,21 +479,21 @@ static int igt_vma_rotate_remap(void *arg)
struct i915_address_space *vm = &ggtt->vm; struct i915_address_space *vm = &ggtt->vm;
struct drm_i915_gem_object *obj; struct drm_i915_gem_object *obj;
const struct intel_remapped_plane_info planes[] = { const struct intel_remapped_plane_info planes[] = {
{ .width = 1, .height = 1, .stride = 1 }, { .width = 1, .height = 1, .src_stride = 1 },
{ .width = 2, .height = 2, .stride = 2 }, { .width = 2, .height = 2, .src_stride = 2 },
{ .width = 4, .height = 4, .stride = 4 }, { .width = 4, .height = 4, .src_stride = 4 },
{ .width = 8, .height = 8, .stride = 8 }, { .width = 8, .height = 8, .src_stride = 8 },
{ .width = 3, .height = 5, .stride = 3 }, { .width = 3, .height = 5, .src_stride = 3 },
{ .width = 3, .height = 5, .stride = 4 }, { .width = 3, .height = 5, .src_stride = 4 },
{ .width = 3, .height = 5, .stride = 5 }, { .width = 3, .height = 5, .src_stride = 5 },
{ .width = 5, .height = 3, .stride = 5 }, { .width = 5, .height = 3, .src_stride = 5 },
{ .width = 5, .height = 3, .stride = 7 }, { .width = 5, .height = 3, .src_stride = 7 },
{ .width = 5, .height = 3, .stride = 9 }, { .width = 5, .height = 3, .src_stride = 9 },
{ .width = 4, .height = 6, .stride = 6 }, { .width = 4, .height = 6, .src_stride = 6 },
{ .width = 6, .height = 4, .stride = 6 }, { .width = 6, .height = 4, .src_stride = 6 },
{ } { }
}, *a, *b; }, *a, *b;
enum i915_ggtt_view_type types[] = { enum i915_ggtt_view_type types[] = {
...@@ -523,8 +523,8 @@ static int igt_vma_rotate_remap(void *arg) ...@@ -523,8 +523,8 @@ static int igt_vma_rotate_remap(void *arg)
struct intel_remapped_plane_info *plane_info = view.remapped.plane; struct intel_remapped_plane_info *plane_info = view.remapped.plane;
unsigned int n, max_offset; unsigned int n, max_offset;
max_offset = max(plane_info[0].stride * plane_info[0].height, max_offset = max(plane_info[0].src_stride * plane_info[0].height,
plane_info[1].stride * plane_info[1].height); plane_info[1].src_stride * plane_info[1].height);
GEM_BUG_ON(max_offset > max_pages); GEM_BUG_ON(max_offset > max_pages);
max_offset = max_pages - max_offset; max_offset = max_pages - max_offset;
...@@ -596,11 +596,11 @@ static int igt_vma_rotate_remap(void *arg) ...@@ -596,11 +596,11 @@ static int igt_vma_rotate_remap(void *arg)
"rotated" : "remapped", n, "rotated" : "remapped", n,
plane_info[0].width, plane_info[0].width,
plane_info[0].height, plane_info[0].height,
plane_info[0].stride, plane_info[0].src_stride,
plane_info[0].offset, plane_info[0].offset,
plane_info[1].width, plane_info[1].width,
plane_info[1].height, plane_info[1].height,
plane_info[1].stride, plane_info[1].src_stride,
plane_info[1].offset); plane_info[1].offset);
err = -EINVAL; err = -EINVAL;
goto out_object; goto out_object;
...@@ -853,21 +853,21 @@ static int igt_vma_remapped_gtt(void *arg) ...@@ -853,21 +853,21 @@ static int igt_vma_remapped_gtt(void *arg)
{ {
struct drm_i915_private *i915 = arg; struct drm_i915_private *i915 = arg;
const struct intel_remapped_plane_info planes[] = { const struct intel_remapped_plane_info planes[] = {
{ .width = 1, .height = 1, .stride = 1 }, { .width = 1, .height = 1, .src_stride = 1 },
{ .width = 2, .height = 2, .stride = 2 }, { .width = 2, .height = 2, .src_stride = 2 },
{ .width = 4, .height = 4, .stride = 4 }, { .width = 4, .height = 4, .src_stride = 4 },
{ .width = 8, .height = 8, .stride = 8 }, { .width = 8, .height = 8, .src_stride = 8 },
{ .width = 3, .height = 5, .stride = 3 }, { .width = 3, .height = 5, .src_stride = 3 },
{ .width = 3, .height = 5, .stride = 4 }, { .width = 3, .height = 5, .src_stride = 4 },
{ .width = 3, .height = 5, .stride = 5 }, { .width = 3, .height = 5, .src_stride = 5 },
{ .width = 5, .height = 3, .stride = 5 }, { .width = 5, .height = 3, .src_stride = 5 },
{ .width = 5, .height = 3, .stride = 7 }, { .width = 5, .height = 3, .src_stride = 7 },
{ .width = 5, .height = 3, .stride = 9 }, { .width = 5, .height = 3, .src_stride = 9 },
{ .width = 4, .height = 6, .stride = 6 }, { .width = 4, .height = 6, .src_stride = 6 },
{ .width = 6, .height = 4, .stride = 6 }, { .width = 6, .height = 4, .src_stride = 6 },
{ } { }
}, *p; }, *p;
enum i915_ggtt_view_type types[] = { enum i915_ggtt_view_type types[] = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7