Re: [PATCH 11/12] drm/i915/selftests: Use i915_gtt_view_is_*()

Jani Nikula
2026-04-08T09:04:15Z

On Wed, 08 Apr 2026, Jani Nikula <jani.nikula@linux.intel.com> wrote:
> On Tue, 07 Apr 2026, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
>> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>>
>> Replace the naked GTT view type checks with the new
>> i915_gtt_view_is_*() helpers. This isolates some of
>> the code from GTT view implementation details.
>>
>> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Reviewed-by: Jani Nikula <jani.nikula@intel.com>

Oh, double space in the Subject.

>
>> ---
>> drivers/gpu/drm/i915/selftests/i915_vma.c | 23 +++++++++++------------
>> 1 file changed, 11 insertions(+), 12 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/selftests/i915_vma.c b/drivers/gpu/drm/i915/selftests/i915_vma.c
>> index 258557388a2d..60dbc6e04f43 100644
>> --- a/drivers/gpu/drm/i915/selftests/i915_vma.c
>> +++ b/drivers/gpu/drm/i915/selftests/i915_vma.c
>> @@ -533,12 +533,11 @@ 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(const struct i915_gtt_view *view,
>> const struct intel_remapped_plane_info *a,
>> const struct intel_remapped_plane_info *b)
>> {
>> -
>> - if (view_type == I915_GTT_VIEW_ROTATED)
>> + if (i915_gtt_view_is_rotated(view))
>> return a->dst_stride * a->width + b->dst_stride * b->width;
>> else
>> return a->dst_stride * a->height + b->dst_stride * b->height;
>> @@ -606,11 +605,11 @@ static int igt_vma_rotate_remap(void *arg)
>> max_offset = max_pages - max_offset;
>>
>> if (!plane_info[0].dst_stride)
>> - plane_info[0].dst_stride = view.type == I915_GTT_VIEW_ROTATED ?
>> + plane_info[0].dst_stride = i915_gtt_view_is_rotated(&view) ?
>> plane_info[0].height :
>> plane_info[0].width;
>> if (!plane_info[1].dst_stride)
>> - plane_info[1].dst_stride = view.type == I915_GTT_VIEW_ROTATED ?
>> + plane_info[1].dst_stride = i915_gtt_view_is_rotated(&view) ?
>> plane_info[1].height :
>> plane_info[1].width;
>>
>> @@ -632,7 +631,7 @@ static int igt_vma_rotate_remap(void *arg)
>> goto out_object;
>> }
>>
>> - expected_pages = remapped_size(view.type, &plane_info[0], &plane_info[1]);
>> + expected_pages = remapped_size(&view, &plane_info[0], &plane_info[1]);
>>
>> if (view.type != I915_GTT_VIEW_NORMAL &&
>> vma->size != expected_pages * PAGE_SIZE) {
>> @@ -664,13 +663,13 @@ static int igt_vma_rotate_remap(void *arg)
>>
>> sg = vma->pages->sgl;
>> for (n = 0; n < ARRAY_SIZE(view.rotated.plane); n++) {
>> - if (view.type == I915_GTT_VIEW_ROTATED)
>> + if (i915_gtt_view_is_rotated(&view))
>> sg = assert_rotated(obj, &view.rotated, n, sg);
>> else
>> sg = assert_remapped(obj, &view.remapped, n, sg);
>> if (IS_ERR(sg)) {
>> pr_err("Inconsistent %s VMA pages for plane %d: [(%d, %d, %d, %d, %d), (%d, %d, %d, %d, %d)]\n",
>> - view.type == I915_GTT_VIEW_ROTATED ?
>> + i915_gtt_view_is_rotated(&view) ?
>> "rotated" : "remapped", n,
>> plane_info[0].width,
>> plane_info[0].height,
>> @@ -1009,7 +1008,7 @@ static int igt_vma_remapped_gtt(void *arg)
>> goto out;
>>
>> if (!plane_info[0].dst_stride)
>> - plane_info[0].dst_stride = *t == I915_GTT_VIEW_ROTATED ?
>> + plane_info[0].dst_stride = i915_gtt_view_is_rotated(&view) ?
>> p->height : p->width;
>>
>> vma = i915_gem_object_ggtt_pin(obj, &view, 0, 0, PIN_MAPPABLE);
>> @@ -1032,7 +1031,7 @@ static int igt_vma_remapped_gtt(void *arg)
>> unsigned int offset;
>> u32 val = y << 16 | x;
>>
>> - if (*t == I915_GTT_VIEW_ROTATED)
>> + if (i915_gtt_view_is_rotated(&view))
>> offset = (x * plane_info[0].dst_stride + y) * PAGE_SIZE;
>> else
>> offset = (y * plane_info[0].dst_stride + x) * PAGE_SIZE;
>> @@ -1064,7 +1063,7 @@ static int igt_vma_remapped_gtt(void *arg)
>> u32 exp = y << 16 | x;
>> u32 val;
>>
>> - if (*t == I915_GTT_VIEW_ROTATED)
>> + if (i915_gtt_view_is_rotated(&view))
>> src_idx = rotated_index(&view.rotated, 0, x, y);
>> else
>> src_idx = remapped_index(&view.remapped, 0, x, y);
>> @@ -1073,7 +1072,7 @@ static int igt_vma_remapped_gtt(void *arg)
>> val = ioread32(&map[offset / sizeof(*map)]);
>> if (val != exp) {
>> pr_err("%s VMA write test failed, expected 0x%x, found 0x%x\n",
>> - *t == I915_GTT_VIEW_ROTATED ? "Rotated" : "Remapped",
>> + i915_gtt_view_is_rotated(&view) ? "Rotated" : "Remapped",
>> exp, val);
>> i915_vma_unpin_iomap(vma);
>> err = -EINVAL;

--
Jani Nikula, Intel