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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 586B4C54FE6 for ; Thu, 27 Feb 2020 14:19:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3080D20801 for ; Thu, 27 Feb 2020 14:19:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582813174; bh=LGF5TDDcjeJpG25rN3SHM7dpbh0Kw+9Jjbg6p0/ySe4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=FidVynHcEpCgfjKTvIoo6jh6cpPb7YsM1dKTH/UX9w8p9T9RALRyh474j1GNQMDaE MFpFwUHV3+bw3m9Ar2QbJ7bO+X4uiD6Kx2NghZ8cgTplwrcylVrYdrcIAbJ1QkLIBf M/5KeDncD2vO4Guo3T07jqpGzpizA7EF96IEta3g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389970AbgB0OTI (ORCPT ); Thu, 27 Feb 2020 09:19:08 -0500 Received: from mail.kernel.org ([198.145.29.99]:59634 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388967AbgB0OS7 (ORCPT ); Thu, 27 Feb 2020 09:18:59 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DD52520801; Thu, 27 Feb 2020 14:18:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582813139; bh=LGF5TDDcjeJpG25rN3SHM7dpbh0Kw+9Jjbg6p0/ySe4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GjD1shWPU5Nm+N0CZf7IlHQn9vBtt2bXiIkviAZkzcwMfJGi3UlMs55SgXW30y6gL VlV+FqUX9knrKdoMwJbpI4tif4l5rieKEJS4WIAYE7twEcWfW5QfnKeC9RMCZn+xXd 4VSvJKlrKyN2WyN67qjMQduFecrIWr4JfMseAPVk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chris Wilson , Mika Kuoppala , Jani Nikula Subject: [PATCH 5.5 111/150] drm/i915/selftests: Add a mock i915_vma to the mock_ring Date: Thu, 27 Feb 2020 14:37:28 +0100 Message-Id: <20200227132249.151357014@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200227132232.815448360@linuxfoundation.org> References: <20200227132232.815448360@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chris Wilson commit 1fdea0cb0dba0d42ffcfb619b349c1a2afa2492e upstream. Add a i915_vma to the mock_engine/mock_ring so that the core code can always assume the presence of ring->vma. Fixes: 8ccfc20a7d56 ("drm/i915/gt: Mark ring->vma as active while pinned") Signed-off-by: Chris Wilson Reviewed-by: Mika Kuoppala Link: https://patchwork.freedesktop.org/patch/msgid/20200114160030.2468927-1-chris@chris-wilson.co.uk (cherry picked from commit b63b4feaef7363d2cf46dd76bb6e87e060b2b0de) Signed-off-by: Jani Nikula Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/i915/gt/mock_engine.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) --- a/drivers/gpu/drm/i915/gt/mock_engine.c +++ b/drivers/gpu/drm/i915/gt/mock_engine.c @@ -59,11 +59,26 @@ static struct intel_ring *mock_ring(stru ring->vaddr = (void *)(ring + 1); atomic_set(&ring->pin_count, 1); + ring->vma = i915_vma_alloc(); + if (!ring->vma) { + kfree(ring); + return NULL; + } + i915_active_init(&ring->vma->active, NULL, NULL); + intel_ring_update_space(ring); return ring; } +static void mock_ring_free(struct intel_ring *ring) +{ + i915_active_fini(&ring->vma->active); + i915_vma_free(ring->vma); + + kfree(ring); +} + static struct i915_request *first_request(struct mock_engine *engine) { return list_first_entry_or_null(&engine->hw_queue, @@ -121,7 +136,7 @@ static void mock_context_destroy(struct GEM_BUG_ON(intel_context_is_pinned(ce)); if (test_bit(CONTEXT_ALLOC_BIT, &ce->flags)) { - kfree(ce->ring); + mock_ring_free(ce->ring); mock_timeline_unpin(ce->timeline); }