From patchwork Mon Sep 21 14:48:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_K=C3=B6nig?= X-Patchwork-Id: 11790259 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C6C536CA for ; Mon, 21 Sep 2020 14:49:15 +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 9DEA0222BB for ; Mon, 21 Sep 2020 14:49:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kfySjzn2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9DEA0222BB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B044A6E46C; Mon, 21 Sep 2020 14:49:09 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by gabe.freedesktop.org (Postfix) with ESMTPS id CE3D06E3A4 for ; Mon, 21 Sep 2020 14:49:05 +0000 (UTC) Received: by mail-wm1-x344.google.com with SMTP id k18so13023500wmj.5 for ; Mon, 21 Sep 2020 07:49:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=v+cROOhuZaDFRVA6j8/5w93Y3+CkZHk7GMcxWGhE4s0=; b=kfySjzn22kr1PjhbnFOVgkA6eb+o5TBAWiIKqNsE09Tn2IYvmFqHcDk9+fqDTZwJG8 zfjhHOH77/GcCzXa0ehnL9sf7Tv0Zol5zO4xaTfxir38R+841pRkBPjZm5YuE/PWOHXa t7BGKPGJNk51JvPGfuS3A7vhqoAWktX999UMmP1VU049AZ61iNZp1Nc1lHmJPz+gHHqC mrRsDWBNtelQwIY0ViNmQPb0TRai7LhCTNothf90x+vlK+OiVmoVlb/cXlJ7cmqWTLW8 lnQMqSgeoVYfarLO2mcaHXaFF/6gDanlrOp4j/C3f1peMK6vkv3+y7KBnOtvxVCogeRj c9CQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=v+cROOhuZaDFRVA6j8/5w93Y3+CkZHk7GMcxWGhE4s0=; b=RyOaBnSHsNW5jxlyy1RYoxrrIKcCONGZojKiT3YsZjfqsIfrDtt2QJZBtHike/MsP5 rmKys3QiMlDw3FFmrNfjBKaYHe6qYzJoWuLwi1uL/ahmjxHYNpQ8+5F8vzeKXzHFVRCo GUeJkx+7f4iJVqYddSyiPwo55fsBGj7xJnH2ytXuclEtkk4w8kFiXkDocUlaGVw74kz8 cTJHjy/UnspzN1FrGgHdkJuZUx9dNgDebX5r0w+hUUWoEXmvJyvB6UXmxqs1tMhlXx2G rXpLax9AMJDk9EbUz4Zo/NsJIgjiFaLrLoWDm0I6UxwIJCRwpc+D4Buo7GFdGpiefHhh AJWg== X-Gm-Message-State: AOAM5336GDt7MyQ0KPjEsuSq2rj70J5EnG9OjxLRwozD/h4QsrvBIQSI JMavk1ReR2ugkMOcD/eny4CLnuYKve4= X-Google-Smtp-Source: ABdhPJxnpRnVBhaGaswqTpBYFIBqzS8bQW9g8UEtgdVItWdwAetexWOc4lfd7HYUdb7JxZ2E+7jJJw== X-Received: by 2002:a7b:c341:: with SMTP id l1mr43397wmj.80.1600699744305; Mon, 21 Sep 2020 07:49:04 -0700 (PDT) Received: from abel.fritz.box ([2a02:908:1252:fb60:3482:3104:ab8c:3ac2]) by smtp.gmail.com with ESMTPSA id i6sm23480992wra.1.2020.09.21.07.49.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Sep 2020 07:49:03 -0700 (PDT) From: " =?utf-8?q?Christian_K=C3=B6nig?= " X-Google-Original-From: =?utf-8?q?Christian_K=C3=B6nig?= To: dri-devel@lists.freedesktop.org, airlied@gmail.com, tzimmermann@suse.de, bskeggs@redhat.com, kraxel@redhat.com, airlied@redhat.com, sroland@vmware.com Subject: [PATCH 06/11] drm/vram-helper: switch over to the new pin interface Date: Mon, 21 Sep 2020 16:48:51 +0200 Message-Id: <20200921144856.2797-7-christian.koenig@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200921144856.2797-1-christian.koenig@amd.com> References: <20200921144856.2797-1-christian.koenig@amd.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Stop using TTM_PL_FLAG_NO_EVICT. Signed-off-by: Christian König Acked-by: Thomas Zimmermann --- drivers/gpu/drm/drm_gem_vram_helper.c | 37 +++++++-------------------- include/drm/drm_gem_vram_helper.h | 3 --- 2 files changed, 9 insertions(+), 31 deletions(-) diff --git a/drivers/gpu/drm/drm_gem_vram_helper.c b/drivers/gpu/drm/drm_gem_vram_helper.c index 50cad0e4a92e..bd3dd17ad81d 100644 --- a/drivers/gpu/drm/drm_gem_vram_helper.c +++ b/drivers/gpu/drm/drm_gem_vram_helper.c @@ -301,7 +301,7 @@ static u64 drm_gem_vram_pg_offset(struct drm_gem_vram_object *gbo) */ s64 drm_gem_vram_offset(struct drm_gem_vram_object *gbo) { - if (WARN_ON_ONCE(!gbo->pin_count)) + if (WARN_ON_ONCE(!gbo->bo.pin_count)) return (s64)-ENODEV; return drm_gem_vram_pg_offset(gbo) << PAGE_SHIFT; } @@ -310,24 +310,21 @@ EXPORT_SYMBOL(drm_gem_vram_offset); static int drm_gem_vram_pin_locked(struct drm_gem_vram_object *gbo, unsigned long pl_flag) { - int i, ret; struct ttm_operation_ctx ctx = { false, false }; + int ret; - if (gbo->pin_count) + if (gbo->bo.pin_count) goto out; if (pl_flag) drm_gem_vram_placement(gbo, pl_flag); - for (i = 0; i < gbo->placement.num_placement; ++i) - gbo->placements[i].flags |= TTM_PL_FLAG_NO_EVICT; - ret = ttm_bo_validate(&gbo->bo, &gbo->placement, &ctx); if (ret < 0) return ret; out: - ++gbo->pin_count; + ttm_bo_pin(&gbo->bo); return 0; } @@ -369,26 +366,9 @@ int drm_gem_vram_pin(struct drm_gem_vram_object *gbo, unsigned long pl_flag) } EXPORT_SYMBOL(drm_gem_vram_pin); -static int drm_gem_vram_unpin_locked(struct drm_gem_vram_object *gbo) +static void drm_gem_vram_unpin_locked(struct drm_gem_vram_object *gbo) { - int i, ret; - struct ttm_operation_ctx ctx = { false, false }; - - if (WARN_ON_ONCE(!gbo->pin_count)) - return 0; - - --gbo->pin_count; - if (gbo->pin_count) - return 0; - - for (i = 0; i < gbo->placement.num_placement ; ++i) - gbo->placements[i].flags &= ~TTM_PL_FLAG_NO_EVICT; - - ret = ttm_bo_validate(&gbo->bo, &gbo->placement, &ctx); - if (ret < 0) - return ret; - - return 0; + ttm_bo_unpin(&gbo->bo); } /** @@ -406,10 +386,11 @@ int drm_gem_vram_unpin(struct drm_gem_vram_object *gbo) ret = ttm_bo_reserve(&gbo->bo, true, false, NULL); if (ret) return ret; - ret = drm_gem_vram_unpin_locked(gbo); + + drm_gem_vram_unpin_locked(gbo); ttm_bo_unreserve(&gbo->bo); - return ret; + return 0; } EXPORT_SYMBOL(drm_gem_vram_unpin); diff --git a/include/drm/drm_gem_vram_helper.h b/include/drm/drm_gem_vram_helper.h index 62cc6e6c3a4f..128f88174d32 100644 --- a/include/drm/drm_gem_vram_helper.h +++ b/include/drm/drm_gem_vram_helper.h @@ -35,7 +35,6 @@ struct vm_area_struct; * @placement: TTM placement information. Supported placements are \ %TTM_PL_VRAM and %TTM_PL_SYSTEM * @placements: TTM placement information. - * @pin_count: Pin counter * * The type struct drm_gem_vram_object represents a GEM object that is * backed by VRAM. It can be used for simple framebuffer devices with @@ -64,8 +63,6 @@ struct drm_gem_vram_object { /* Supported placements are %TTM_PL_VRAM and %TTM_PL_SYSTEM */ struct ttm_placement placement; struct ttm_place placements[2]; - - int pin_count; }; /**