From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3DAE7C4338F for ; Thu, 29 Jul 2021 02:14:46 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DC35760E09 for ; Thu, 29 Jul 2021 02:14:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org DC35760E09 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=jlekstrand.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 72BFF6E7E5; Thu, 29 Jul 2021 02:14:45 +0000 (UTC) Received: from mail-ot1-x32a.google.com (mail-ot1-x32a.google.com [IPv6:2607:f8b0:4864:20::32a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 46B7A6E7E5 for ; Thu, 29 Jul 2021 02:14:44 +0000 (UTC) Received: by mail-ot1-x32a.google.com with SMTP id v8-20020a0568301bc8b02904d5b4e5ca3aso4202106ota.13 for ; Wed, 28 Jul 2021 19:14:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jlekstrand-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:date:message-id:in-reply-to:references:user-agent :subject:mime-version; bh=RKcHeVvw16ovUpP8GEZ6BTrOqKRokMe4yAiNEIUj+ew=; b=lHM9MrZBCcdqjOiYzh5aS5m1SCpmNbjI1/f3+dV75FUKSnkpNy0enFMCyf/Zja+xET 9T065+MmGCFyXdXk7AAtgT1UE7aMrvRVY0jd0exTi4SDZYz6gDib4OIR+4NR/pWzDnAD wQNEYDNY++h4QcBbrSBEFYGuIRkYcqPNTJ/J+c202GRn5DaRveI/UeUVCzAFJtPSY7p4 JS13dWon5hsfp1AhjoAspAuPXxKrkJ5Gvs6ye/haNmqrB+muYV+QsM9A1t5Cx3oJiU/S 6HVHPMvuJM9d5vYwQ0KyoEcLsQiCixeVsq3ePlzGiwWVRs2XKnb4HsT13OT/aTuUH9qo kDtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:date:message-id:in-reply-to :references:user-agent:subject:mime-version; bh=RKcHeVvw16ovUpP8GEZ6BTrOqKRokMe4yAiNEIUj+ew=; b=QaAghZtpzsKyrsbxZwGjMWtUtSGVab4c1qCuMWzctjAKGsfIHUcqlQDREmskQeXEVf PbDl3HfM4jBav/8JHD627zzU/8yyCuafqemGTxmZeJITZWiivS1a9Us1EGsvuG8yT6hu lbsgrhammL/Pz607hCast31G2dmys0oh/zIpOo1xfyop0oR8+3cytYFYCZxUzw5YK7qU FWBNS8LtAmtWca2iHsKXR0gJ/YvXB5D5bMHWGXOJZOWtx47J9r/Y7OILq/pv0C3AgORK 7kzcOsXmLo2bVQCVtuYZpKVbGU4nL+xSHlbMebkP7s5v6DluW53k4yHxOgxm+j6iYaBr 8idw== X-Gm-Message-State: AOAM5310xehhkqaX/heg1AkMgpmGbCRsadbqMH63lH2DSxxJMDwIWx+V mbY5HYc5UVwaawIr0CYDRGavHg== X-Google-Smtp-Source: ABdhPJwPJ53Vs9M4+90a0FM9VefA6mhmmSbR2UkVToV2IIkvkRyb2QjnfUKiCOOxrZpiD9WYdgbZzg== X-Received: by 2002:a05:6830:1414:: with SMTP id v20mr1887957otp.69.1627524883485; Wed, 28 Jul 2021 19:14:43 -0700 (PDT) Received: from [100.72.193.189] ([209.107.186.70]) by smtp.gmail.com with ESMTPSA id z22sm274888ooz.20.2021.07.28.19.14.42 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Jul 2021 19:14:43 -0700 (PDT) From: Jason Ekstrand To: Matthew Auld , Date: Wed, 28 Jul 2021 21:14:41 -0500 Message-ID: <17af00ad680.2817.c6988b7ea6112e3e892765a0d4287e0c@jlekstrand.net> In-Reply-To: <20210728155711.1744601-1-matthew.auld@intel.com> References: <20210728155711.1744601-1-matthew.auld@intel.com> User-Agent: AquaMail/1.30.0-1826 (build: 103000001) MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH] drm/i915/selftests: prefer the create_user helper X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dri-devel@lists.freedesktop.org Content-Type: multipart/mixed; boundary="===============1776985860==" Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" This is a multi-part message in MIME format. --===============1776985860== Content-Type: multipart/alternative; boundary="17af00ada8db272817f17f5af" This is a multi-part message in MIME format. --17af00ada8db272817f17f5af Content-Type: text/plain; format=flowed; charset="us-ascii" Content-Transfer-Encoding: 8bit On July 28, 2021 10:57:23 Matthew Auld wrote: > No need to hand roll the set_placements stuff, now that that we have a > helper for this. Also no need to handle the -ENODEV case here, since > NULL mr implies missing device support, where the for_each_memory_region > helper will always skip over such regions. > > Signed-off-by: Matthew Auld > Cc: Jason Ekstrand Reviewed-by: Jason Ekstrand > --- > .../drm/i915/gem/selftests/i915_gem_mman.c | 46 ++----------------- > 1 file changed, 4 insertions(+), 42 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c > b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c > index 0b2b73d8a364..eed1c2c64e75 100644 > --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c > +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c > @@ -860,24 +860,6 @@ static bool can_mmap(struct drm_i915_gem_object *obj, > enum i915_mmap_type type) > return !no_map; > } > > -static void object_set_placements(struct drm_i915_gem_object *obj, > - struct intel_memory_region **placements, > - unsigned int n_placements) > -{ > - GEM_BUG_ON(!n_placements); > - > - if (n_placements == 1) { > - struct drm_i915_private *i915 = to_i915(obj->base.dev); > - struct intel_memory_region *mr = placements[0]; > - > - obj->mm.placements = &i915->mm.regions[mr->id]; > - obj->mm.n_placements = 1; > - } else { > - obj->mm.placements = placements; > - obj->mm.n_placements = n_placements; > - } > -} > - > #define expand32(x) (((x) << 0) | ((x) << 8) | ((x) << 16) | ((x) << 24)) > static int __igt_mmap(struct drm_i915_private *i915, > struct drm_i915_gem_object *obj, > @@ -972,15 +954,10 @@ static int igt_mmap(void *arg) > struct drm_i915_gem_object *obj; > int err; > > - obj = i915_gem_object_create_region(mr, sizes[i], 0, I915_BO_ALLOC_USER); > - if (obj == ERR_PTR(-ENODEV)) > - continue; > - > + obj = __i915_gem_object_create_user(i915, sizes[i], &mr, 1); > if (IS_ERR(obj)) > return PTR_ERR(obj); > > - object_set_placements(obj, &mr, 1); > - > err = __igt_mmap(i915, obj, I915_MMAP_TYPE_GTT); > if (err == 0) > err = __igt_mmap(i915, obj, I915_MMAP_TYPE_WC); > @@ -1101,15 +1078,10 @@ static int igt_mmap_access(void *arg) > struct drm_i915_gem_object *obj; > int err; > > - obj = i915_gem_object_create_region(mr, PAGE_SIZE, 0, I915_BO_ALLOC_USER); > - if (obj == ERR_PTR(-ENODEV)) > - continue; > - > + obj = __i915_gem_object_create_user(i915, PAGE_SIZE, &mr, 1); > if (IS_ERR(obj)) > return PTR_ERR(obj); > > - object_set_placements(obj, &mr, 1); > - > err = __igt_mmap_access(i915, obj, I915_MMAP_TYPE_GTT); > if (err == 0) > err = __igt_mmap_access(i915, obj, I915_MMAP_TYPE_WB); > @@ -1248,15 +1220,10 @@ static int igt_mmap_gpu(void *arg) > struct drm_i915_gem_object *obj; > int err; > > - obj = i915_gem_object_create_region(mr, PAGE_SIZE, 0, I915_BO_ALLOC_USER); > - if (obj == ERR_PTR(-ENODEV)) > - continue; > - > + obj = __i915_gem_object_create_user(i915, PAGE_SIZE, &mr, 1); > if (IS_ERR(obj)) > return PTR_ERR(obj); > > - object_set_placements(obj, &mr, 1); > - > err = __igt_mmap_gpu(i915, obj, I915_MMAP_TYPE_GTT); > if (err == 0) > err = __igt_mmap_gpu(i915, obj, I915_MMAP_TYPE_WC); > @@ -1405,15 +1372,10 @@ static int igt_mmap_revoke(void *arg) > struct drm_i915_gem_object *obj; > int err; > > - obj = i915_gem_object_create_region(mr, PAGE_SIZE, 0, I915_BO_ALLOC_USER); > - if (obj == ERR_PTR(-ENODEV)) > - continue; > - > + obj = __i915_gem_object_create_user(i915, PAGE_SIZE, &mr, 1); > if (IS_ERR(obj)) > return PTR_ERR(obj); > > - object_set_placements(obj, &mr, 1); > - > err = __igt_mmap_revoke(i915, obj, I915_MMAP_TYPE_GTT); > if (err == 0) > err = __igt_mmap_revoke(i915, obj, I915_MMAP_TYPE_WC); > -- > 2.26.3 --17af00ada8db272817f17f5af Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable
On July 28, 2021 10:57:2= 3 Matthew Auld <matthew.auld@intel.com> wrote:

No need to hand roll the set_placements stuff, now that t= hat we have a
helper for this. Also no need to handle the -ENODEV case = here, since
NULL mr implies missing device support, where the for_eac= h_memory_region
helper will always skip over such regions.

Signed-off-by: Matthew Auld <matthew.auld@intel.com>= ;
Cc: Jason Ekstrand <jason@jlekstrand.net>

Reviewed-by: J= ason Ekstrand <jason@jlekstrand.net>


=
---
 .../drm/i915/gem/selftests/i915_gem_mman.c   &= nbsp;| 46 ++-----------------
 1 file changed, 4 insertions(+), 42 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_= mman.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
index 0b2b73d8a364..eed1c2c64e75 100644
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c<= /div>
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c<= /div>
@@ -860,24 +860,6 @@ static bool can_mmap(struct drm_i915= _gem_object *obj, enum i915_mmap_type type)
 =09return !no_map;
 }
 
-static void object_set_placements(struct drm_i915_gem_ob= ject *obj,
-=09=09=09=09  struct intel_memory_region **placemen= ts,
-=09=09=09=09  unsigned int n_placements)
-{
-=09GEM_BUG_ON(!n_placements);
-
-=09if (n_placements =3D=3D 1) {
-=09=09struct drm_i915_private *i915 =3D to_i915(obj->= base.dev);
-=09=09struct intel_memory_region *mr =3D placements[0];<= /div>
-
-=09=09obj->mm.placements =3D &i915->mm.regions= [mr->id];
-=09=09obj->mm.n_placements =3D 1;
-=09} else {
-=09=09obj->mm.placements =3D placements;
-=09=09obj->mm.n_placements =3D n_placements;
-=09}
-}
-
 #define expand32(x) (((x) << 0) | ((x) <&l= t; 8) | ((x) << 16) | ((x) << 24))
 static int __igt_mmap(struct drm_i915_private *i915= ,
 =09=09      struct drm_i915_gem_obje= ct *obj,
@@ -972,15 +954,10 @@ static int igt_mmap(void *arg)
 =09=09=09struct drm_i915_gem_object *obj;
 =09=09=09int err;
 
-=09=09=09obj =3D i915_gem_object_create_region(mr, sizes= [i], 0, I915_BO_ALLOC_USER);
-=09=09=09if (obj =3D=3D ERR_PTR(-ENODEV))
-=09=09=09=09continue;
-
+=09=09=09obj =3D __i915_gem_object_create_user(i915, siz= es[i], &mr, 1);
 =09=09=09if (IS_ERR(obj))
 =09=09=09=09return PTR_ERR(obj);
 
-=09=09=09object_set_placements(obj, &mr, 1);
-
 =09=09=09err =3D __igt_mmap(i915, obj, I915_MMAP_TY= PE_GTT);
 =09=09=09if (err =3D=3D 0)
 =09=09=09=09err =3D __igt_mmap(i915, obj, I915_MMAP= _TYPE_WC);
@@ -1101,15 +1078,10 @@ static int igt_mmap_access(void *= arg)
 =09=09struct drm_i915_gem_object *obj;
 =09=09int err;
 
-=09=09obj =3D i915_gem_object_create_region(mr, PAGE_SIZ= E, 0, I915_BO_ALLOC_USER);
-=09=09if (obj =3D=3D ERR_PTR(-ENODEV))
-=09=09=09continue;
-
+=09=09obj =3D __i915_gem_object_create_user(i915, PAGE_S= IZE, &mr, 1);
 =09=09if (IS_ERR(obj))
 =09=09=09return PTR_ERR(obj);
 
-=09=09object_set_placements(obj, &mr, 1);
-
 =09=09err =3D __igt_mmap_access(i915, obj, I915_MMA= P_TYPE_GTT);
 =09=09if (err =3D=3D 0)
 =09=09=09err =3D __igt_mmap_access(i915, obj, I915_= MMAP_TYPE_WB);
@@ -1248,15 +1220,10 @@ static int igt_mmap_gpu(void *arg= )
 =09=09struct drm_i915_gem_object *obj;
 =09=09int err;
 
-=09=09obj =3D i915_gem_object_create_region(mr, PAGE_SIZ= E, 0, I915_BO_ALLOC_USER);
-=09=09if (obj =3D=3D ERR_PTR(-ENODEV))
-=09=09=09continue;
-
+=09=09obj =3D __i915_gem_object_create_user(i915, PAGE_S= IZE, &mr, 1);
 =09=09if (IS_ERR(obj))
 =09=09=09return PTR_ERR(obj);
 
-=09=09object_set_placements(obj, &mr, 1);
-
 =09=09err =3D __igt_mmap_gpu(i915, obj, I915_MMAP_T= YPE_GTT);
 =09=09if (err =3D=3D 0)
 =09=09=09err =3D __igt_mmap_gpu(i915, obj, I915_MMA= P_TYPE_WC);
@@ -1405,15 +1372,10 @@ static int igt_mmap_revoke(void *= arg)
 =09=09struct drm_i915_gem_object *obj;
 =09=09int err;
 
-=09=09obj =3D i915_gem_object_create_region(mr, PAGE_SIZ= E, 0, I915_BO_ALLOC_USER);
-=09=09if (obj =3D=3D ERR_PTR(-ENODEV))
-=09=09=09continue;
-
+=09=09obj =3D __i915_gem_object_create_user(i915, PAGE_S= IZE, &mr, 1);
 =09=09if (IS_ERR(obj))
 =09=09=09return PTR_ERR(obj);
 
-=09=09object_set_placements(obj, &mr, 1);
-
 =09=09err =3D __igt_mmap_revoke(i915, obj, I915_MMA= P_TYPE_GTT);
 =09=09if (err =3D=3D 0)
 =09=09=09err =3D __igt_mmap_revoke(i915, obj, I915_= MMAP_TYPE_WC);
-- 
2.26.3

--17af00ada8db272817f17f5af-- --===============1776985860== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx --===============1776985860==--