From patchwork Tue Jul 21 07:32:36 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: 11675065 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 99AB513B6 for ; Tue, 21 Jul 2020 07:32:57 +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 77DE12080D for ; Tue, 21 Jul 2020 07:32:57 +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="RD8KwmtA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 77DE12080D 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 012DB6E497; Tue, 21 Jul 2020 07:32:52 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by gabe.freedesktop.org (Postfix) with ESMTPS id 07A216E491 for ; Tue, 21 Jul 2020 07:32:50 +0000 (UTC) Received: by mail-wm1-x343.google.com with SMTP id w3so1823779wmi.4 for ; Tue, 21 Jul 2020 00:32:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VdG50vh0bvv6u6Fo3R3hPlnSWDpEIu/D8UHTKBiWNxc=; b=RD8KwmtATC4J7W1rQpzbjgpV6KYJf4zHuuZZunVttUX/EHdtu0V/cC2Cn6U1TZd07D KKsIaJOnJC+yee00wR8RVQ7g+gl7C2+lGiwAiVixx9IJkLJMHXDGrFspHaKZ2vJpUHVT ny2UyRF+WBjqJcU4wpgybWTb5C6OZfm6H8E3gaJpbms0LbHoIWwuS02NlrxwY7M73vAE pAfP9AHcZPyr2jjGRdeYlN0DMF1dke7vjfhrfxG3YO/E1b4Raag97yAXNjNHSGDqEv3y yrXoCBVf5bkyrqLKr7D39frH3ewJIQw8Xntitp2wDHRUZ52Em4Ie6JY8Yrd29Za7VWw1 SsLg== 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:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VdG50vh0bvv6u6Fo3R3hPlnSWDpEIu/D8UHTKBiWNxc=; b=hU5enOnUlS05l7AdehO5jbLvzhWDHgR0uB/22ESAdXgqlNcsYx2/xYeVgLeo2eNkWT wOQgum3Pl+bZ6IiayoCsvZj9mVwOjqr/sXNsMV226vIrcci30l56slTsHBQuKOPFycs8 JnhmPVTC47Fd7rm7mK5yAmLDLvIhVGk2dl52zE1WjTWgCaYc/DD3GGbmOIlEIQQLI8dN tshPKsp4cA2Pu6gZQzTWL06S4QKoLzT77017vNoHDcOO998KqzjZDEtDcGjKEvh35Uvq y61AQMXb4k4sjwg0L4jwYWR6+LvPuK35Fd8ITBCb7Su0Mo2XQcnJhL8XIl9htaqTQpyN BDLQ== X-Gm-Message-State: AOAM531h7guXjQkZT+Apw0yEFtU1HHvpwNoUqpNenG1QOl0gNE/9AKzw QzSvaumU0ftgqCKIkvzp+KOGDILF X-Google-Smtp-Source: ABdhPJwovxiG67gvmMf4+BFaKJy7rC3ni2R/2wD87h9d8K8RA8v/VILSoD2edYYDak3hAJ2HnCwIKw== X-Received: by 2002:a7b:c14a:: with SMTP id z10mr2654622wmi.19.1595316768424; Tue, 21 Jul 2020 00:32:48 -0700 (PDT) Received: from abel.fritz.box ([2a02:908:1252:fb60:5eb1:eb29:dadc:7fc5]) by smtp.gmail.com with ESMTPSA id s4sm29740896wre.53.2020.07.21.00.32.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2020 00:32:48 -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 Subject: [PATCH 02/11] drm/ttm: cleanup io_mem interface with nouveau Date: Tue, 21 Jul 2020 09:32:36 +0200 Message-Id: <20200721073245.2484-2-christian.koenig@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200721073245.2484-1-christian.koenig@amd.com> References: <20200721073245.2484-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: , Cc: Madhav.Chauhan@amd.com, michael.j.ruhl@intel.com, tzimmermann@suse.de Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Nouveau is the only user of this functionality and evicting io space on -EAGAIN is really a misuse of the return code. Instead switch to using -ENOSPC here which makes much more sense and simplifies the code. Signed-off-by: Christian König Signed-off-by: Christian König --- drivers/gpu/drm/nouveau/nouveau_bo.c | 2 -- drivers/gpu/drm/ttm/ttm_bo_util.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index 61355cfb7335..a48652826f67 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -1505,8 +1505,6 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *reg) if (ret != 1) { if (WARN_ON(ret == 0)) return -EINVAL; - if (ret == -ENOSPC) - return -EAGAIN; return ret; } diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index 5e0f3a9caedc..7d2c50fef456 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c @@ -116,7 +116,7 @@ static int ttm_mem_io_evict(struct ttm_mem_type_manager *man) struct ttm_buffer_object *bo; if (!man->use_io_reserve_lru || list_empty(&man->io_reserve_lru)) - return -EAGAIN; + return -ENOSPC; bo = list_first_entry(&man->io_reserve_lru, struct ttm_buffer_object, @@ -143,7 +143,7 @@ int ttm_mem_io_reserve(struct ttm_bo_device *bdev, mem->bus.io_reserved_count++ == 0) { retry: ret = bdev->driver->io_mem_reserve(bdev, mem); - if (ret == -EAGAIN) { + if (ret == -ENOSPC) { ret = ttm_mem_io_evict(man); if (ret == 0) goto retry;