Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp722985iog; Fri, 17 Jun 2022 12:07:17 -0700 (PDT) X-Google-Smtp-Source: AGRyM1udlwfTR2pq3KCdpA09nFpmAqk5cE35xrS/Iixp/KegtRp1wcuXbpRWe3Awv3e5k9Rqv75d X-Received: by 2002:a63:7c51:0:b0:408:c3db:e248 with SMTP id l17-20020a637c51000000b00408c3dbe248mr10468947pgn.490.1655492837530; Fri, 17 Jun 2022 12:07:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655492837; cv=none; d=google.com; s=arc-20160816; b=dgcvpj4l8ZhazdBVg3TZALeI6FC8sLe1rNeqz4utngGWSy9+/XOXfZEVdweXsuKopF mvB9JGArZx3cTEE9DyPYl5Qpdpz7mPZz/DHRyIEQHnxsmGxfhyT2Hx27Qj/YKUUPXkE5 fQ+bEME3dl1c9H3BBkpsrPqQc7DL1pOvQTvq3l/U4340L63rWSkgbCmMbUPfMFrQgUA+ BqwqENVqRyoZSC5sGl8UbOda9Vke6VfYkkPfR/0t5MJuW3yKhJGIScRzz0OGkF80b7BE 64Bel20L2zLKijW3EyDSpok7lJTPV/GZWGb7UQLLoZNEc2b0KW0RVCWhie49dzMkrMNq ExXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Ruuoe24qWSMX4f3mxXMtChvDgoNdDLZ7+F6+4zkjwog=; b=kyCQ9YtKnbZJOl7NJ8OWwWJCxlW0B6p6DGUX9NxLQTgyzzuwo8FTLGMyHOm67jnGnR MNeTm/j4RctoLcKLW8TE4SknrRvok6wUW7MUka51IqlkD+CPISMAnN00wm3IYOJq5Brl cqHGwaEgFWJ7bCa6dd+SkMlDaG/OYutPtjCcfi42HdzFZIUpW8CS9jDWYbJH0B0NvqLJ YpubgnXrK5C1VncJGeKvX7m5diL7hdnOdUpOo6Fnoes3qj7umJnCT1A6Y0iV5LUEH1q/ t2zeO0g/K+tw2nNNzv0DnRCcn15fJrhIBfn/FvnN5krkUbqz3yssFGScpfE6JejgN+dF +6dA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=jSvyx8+g; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j27-20020a63231b000000b003fd6796915fsi6717469pgj.170.2022.06.17.12.07.05; Fri, 17 Jun 2022 12:07:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=jSvyx8+g; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235687AbiFQTFv (ORCPT + 99 others); Fri, 17 Jun 2022 15:05:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52756 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234281AbiFQTFp (ORCPT ); Fri, 17 Jun 2022 15:05:45 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84E5942EF9 for ; Fri, 17 Jun 2022 12:05:44 -0700 (PDT) Received: from hermes-devbox.fritz.box (82-71-8-225.dsl.in-addr.zen.co.uk [82.71.8.225]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: bbeckett) by madras.collabora.co.uk (Postfix) with ESMTPSA id 165E26601815; Fri, 17 Jun 2022 20:05:43 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1655492743; bh=NNjcoDidsEevqXEiV8GzBg83apsOHvIp6XGvRc7cnZo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jSvyx8+gs1CHopAFpYO5MJaVdzl6X9s8j5SACF6sv1957YEYE66fqf3EYkIOX2yUX NTSLlwSu2MqjAxKsUgdRpkXhYq4l0UygtfSTZfi6LwxHV4w+OGszl42oUCt3WRHCk+ eZ3yCKWC5aHuQ7U5XO82sPbuZf/9reySB36IK4DOqHdbOLfHn4r60YALq5qKVQNmZf MheUmgwSQ/qFmnAB20vaSfBfB6WkOjRw2srv7+NzxrCs1Ao+BzYl0V+aowtNr0w7fK lTSoWnetEf9y2rTStfowLYGb6t2Faat+WiC2Ur6PcGfX6Ks2VvHsfdFk6ltMd97y2w GS1yxse8A22vg== From: Robert Beckett To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter Cc: kernel@collabora.com, Robert Beckett , Matthew Auld , =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , linux-kernel@vger.kernel.org Subject: [PATCH v6 04/10] drm/i915/gem: selftest should not attempt mmap of private regions Date: Fri, 17 Jun 2022 19:05:10 +0000 Message-Id: <20220617190516.2805572-5-bob.beckett@collabora.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220617190516.2805572-1-bob.beckett@collabora.com> References: <20220617190516.2805572-1-bob.beckett@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org During testing make can_mmap consider whether the region is private. Signed-off-by: Robert Beckett --- drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 3 +++ 1 file changed, 3 insertions(+) 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 5bc93a1ce3e3..76181e28c75e 100644 --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c @@ -869,6 +869,9 @@ static bool can_mmap(struct drm_i915_gem_object *obj, enum i915_mmap_type type) struct drm_i915_private *i915 = to_i915(obj->base.dev); bool no_map; + if (obj->mm.region && obj->mm.region->private) + return false; + if (obj->ops->mmap_offset) return type == I915_MMAP_TYPE_FIXED; else if (type == I915_MMAP_TYPE_FIXED) -- 2.25.1