Re: [PATCH v2 32/38] drm/i915: Verify page layout for rotated VMA

[Matthew Auld <matthew.william.auld@gmail.com>]

On 19 January 2017 at 11:41, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> Exercise creating rotated VMA and checking the page order within.
>
> v2: Be more creative in rotated params
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
>  drivers/gpu/drm/i915/selftests/i915_vma.c | 177 ++++++++++++++++++++++++++++++
>  1 file changed, 177 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/selftests/i915_vma.c b/drivers/gpu/drm/i915/selftests/i915_vma.c
> index b45b392444e4..2bda93f53b47 100644
> --- a/drivers/gpu/drm/i915/selftests/i915_vma.c
> +++ b/drivers/gpu/drm/i915/selftests/i915_vma.c
> @@ -310,11 +310,188 @@ static int igt_vma_pin1(void *arg)
>         return err;
>  }
>
> +static unsigned long rotated_index(const struct intel_rotation_info *r,
> +                                  unsigned int n,
> +                                  unsigned int x,
> +                                  unsigned int y)
> +{
> +       return (r->plane[n].stride * (r->plane[n].height - y - 1) +
> +               r->plane[n].offset + x);
> +}
> +
> +static struct scatterlist *
> +assert_rotated(struct drm_i915_gem_object *obj,
> +              const struct intel_rotation_info *r, unsigned int n,
> +              struct scatterlist *sg)
> +{
> +       unsigned int x, y;
> +
> +       for (x = 0; x < r->plane[n].width; x++) {
> +               for (y = 0; y < r->plane[n].height; y++) {
> +                       unsigned long src_idx;
> +                       dma_addr_t src;
> +
> +                       src_idx = rotated_index(r, n, x, y);
> +                       src = i915_gem_object_get_dma_address(obj, src_idx);
> +
> +                       if (sg_dma_len(sg) != PAGE_SIZE) {
> +                               pr_err("Invalid sg.length, found %d, expected %lu for rotated page (%d, %d) [src index %lu]\n",
> +                                      sg_dma_len(sg), PAGE_SIZE,
> +                                      x, y, src_idx);
> +                               return ERR_PTR(-EINVAL);
> +                       }
> +
> +                       if (sg_dma_address(sg) != src) {
> +                               pr_err("Invalid address for rotated page (%d, %d) [src index %lu]\n",
> +                                      x, y, src_idx);
> +                               return ERR_PTR(-EINVAL);
> +                       }
> +
> +                       sg = ____sg_next(sg);
> +               }
> +       }
> +
> +       return sg;
> +}
> +
> +static unsigned int rotated_size(const struct intel_rotation_plane_info *a,
> +                                const struct intel_rotation_plane_info *b)
> +{
> +       return a->width * a->height + b->width * b->height;
> +}
> +
> +static int igt_vma_rotate(void *arg)
> +{
> +       struct drm_i915_private *i915 = arg;
> +       struct drm_i915_gem_object *obj;
> +       const struct intel_rotation_plane_info planes[] = {
> +               { .width = 1, .height = 1, .stride = 1 },
> +               { .width = 3, .height = 5, .stride = 4 },
> +               { .width = 5, .height = 3, .stride = 7 },
> +               { .width = 6, .height = 4, .stride = 6 },
> +               { }
> +       }, *a, *b;
> +       const unsigned int max_pages = 64;
> +       int err = -ENOMEM;
> +
> +       /* Create VMA for many different combinations of planes and check
> +        * that the page layout within the rotated VMA match our expectations.
> +        */
> +
> +       obj = i915_gem_object_create_internal(i915, max_pages * PAGE_SIZE);
> +       if (IS_ERR(obj))
> +               goto err;
> +
> +       for (a = planes; a->width; a++) {
> +               for (b = planes + ARRAY_SIZE(planes); b-- != planes; ) {
> +                       struct i915_ggtt_view view;
> +                       struct scatterlist *sg;
> +                       unsigned int n, max_offset;
> +
> +                       max_offset = max(a->stride * a->height,
> +                                        b->stride * b->height);
> +                       GEM_BUG_ON(max_offset >= max_pages);
> +                       max_offset = max_pages - max_offset;
> +
> +                       view.type = I915_GGTT_VIEW_ROTATED;
> +                       view.rotated.plane[0] = *a;
> +                       view.rotated.plane[1] = *b;
> +
> +                       for_each_prime_number_from(view.rotated.plane[0].offset, 0, max_offset) {
> +                               for_each_prime_number_from(view.rotated.plane[1].offset, 0, max_offset) {
> +                                       struct i915_address_space *vm =
> +                                               &i915->ggtt.base;
> +                                       struct i915_vma *vma;
> +
> +                                       vma = i915_vma_instance(obj, vm, &view);
> +                                       if (IS_ERR(vma)) {
> +                                               err = PTR_ERR(vma);
> +                                               goto err_object;
> +                                       }
> +
> +                                       if (!i915_vma_is_ggtt(vma) ||
> +                                           vma->vm != vm) {
> +                                               pr_err("VMA is not in the GGTT!\n");
> +                                               err = -EINVAL;
> +                                               goto err_object;
> +                                       }
> +
> +                                       if (memcmp(&vma->ggtt_view, &view, sizeof(view))) {
> +                                               pr_err("VMA mismatch upon creation!\n");
> +                                               err = -EINVAL;
> +                                               goto err_object;
> +                                       }
> +
> +                                       if (i915_vma_compare(vma,
> +                                                            vma->vm,
> +                                                            &vma->ggtt_view)) {
> +                                               pr_err("VMA compmare failed with itself\n");
s/compmare/compare/

Reviewed-by: Matthew Auld <matthew.auld@intel.com>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx