From patchwork Thu Oct 1 11:28:12 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: 11811317 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 BC24B6CA for ; Thu, 1 Oct 2020 11:28:29 +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 9087B20691 for ; Thu, 1 Oct 2020 11:28:29 +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="rT9virqV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9087B20691 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 F26286E891; Thu, 1 Oct 2020 11:28:23 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ej1-x641.google.com (mail-ej1-x641.google.com [IPv6:2a00:1450:4864:20::641]) by gabe.freedesktop.org (Postfix) with ESMTPS id 191706E891 for ; Thu, 1 Oct 2020 11:28:22 +0000 (UTC) Received: by mail-ej1-x641.google.com with SMTP id i26so7467349ejb.12 for ; Thu, 01 Oct 2020 04:28:22 -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=rGW1VKhK2gTXdeio8SdCtrz5PoSyJCKHMHzyXOz07VM=; b=rT9virqVSyqVBLZNANkLyrcZInRMPSlOxNZItHyTKUH4WVNHGLzWqr+aHJF/w8+nlE fD1jqTyikzMqbXtOErBqAN3iVEDQzZXbeSmGrsJi11PeaAgV+gvRiYlL30IOo5wNfWlV mri3/0VfsWSLIFbsUzzZYXXdvV7bsTB+Te4FGoaYKjv8duacw91jXBRzUlYVIZUXKj8y 19lV6vIFGaeC5XZLHxpma5r/GE+JCA1v08GdfV4G3s7ne9SRJfCQW5dLw8kDWow3GjvU UH/ufBl7TH/5S4vCb/K4z/bTWvrbUjPcTuqqzpXwJUWLOChOn1MnAYkQcIDLhf4gn2pQ NoSw== 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=rGW1VKhK2gTXdeio8SdCtrz5PoSyJCKHMHzyXOz07VM=; b=kuQmiuw9g+1BRhEbZkkc28T8mEp9iAe3tbaNCDv01EyolNiQ5niU4Bt3UioSuNNbBc Z8VJaWXnz1D0piJKddkrFMKuy06Dg/S9hzpqeezlUsvOWXXT9dO9vq1KiOcAU1r3lLog t8oXISwwXoz6KNvQ6VpeETaREcuF9yYqaDBuY4Yo9vkFhrO9zAU1QqhsJKc34TTjDf4O 5FyVwnsCkYpaVTVo/cjc11+gkwXtiGj7s9ShFv8/VNI60eBJtzUdUWRRr5ODhXq947ER EncF6DKFTAo/VunGZVIo+IUhsfvTjPcC1GI1cNqRPdSvGdRCbBKCHsqY2GfOYxKvM1cc LWZg== X-Gm-Message-State: AOAM532SHD5+8j2HZZMtR+lm6o1IldWdtjpxiFkk0MK/RUblxPTYGrmP wMFLhkKrRB61aubYoMxz4OWibrYEd2o= X-Google-Smtp-Source: ABdhPJzP0yYPSiktNwwP3NhH78ooSuMn20SXlvFv0iy9l8AYcWWq07ESULGkjxT2eWaplQS8BC5DLQ== X-Received: by 2002:a17:906:7e4c:: with SMTP id z12mr7493812ejr.123.1601551700479; Thu, 01 Oct 2020 04:28:20 -0700 (PDT) Received: from abel.fritz.box ([2a02:908:1252:fb60:36be:5a08:8c1d:6b2b]) by smtp.gmail.com with ESMTPSA id p3sm3834892edp.28.2020.10.01.04.28.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Oct 2020 04:28:19 -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, ray.huang@amd.com, airlied@gmail.com, daniel@ffwll.ch Subject: [PATCH 3/8] drm/ttm: cleanup ttm_handle_caching_state_failure Date: Thu, 1 Oct 2020 13:28:12 +0200 Message-Id: <20201001112817.20967-3-christian.koenig@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201001112817.20967-1-christian.koenig@amd.com> References: <20201001112817.20967-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" Remove unused parameters, shorten the function name. Signed-off-by: Christian König Reviewed-by: Michael J. Ruhl --- drivers/gpu/drm/ttm/ttm_page_alloc.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c index 912c30dcc9db..111031cbb6df 100644 --- a/drivers/gpu/drm/ttm/ttm_page_alloc.c +++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c @@ -467,11 +467,11 @@ static int ttm_set_pages_caching(struct page **pages, * any pages that have changed their caching state already put them to the * pool. */ -static void ttm_handle_caching_state_failure(struct list_head *pages, - int ttm_flags, enum ttm_caching_state cstate, - struct page **failed_pages, unsigned cpages) +static void ttm_handle_caching_failure(struct page **failed_pages, + unsigned cpages) { unsigned i; + /* Failed pages have to be freed */ for (i = 0; i < cpages; ++i) { list_del(&failed_pages[i]->lru); @@ -517,9 +517,8 @@ static int ttm_alloc_new_pages(struct list_head *pages, gfp_t gfp_flags, r = ttm_set_pages_caching(caching_array, cstate, cpages); if (r) - ttm_handle_caching_state_failure(pages, - ttm_flags, cstate, - caching_array, cpages); + ttm_handle_caching_failure(caching_array, + cpages); } r = -ENOMEM; goto out; @@ -542,9 +541,8 @@ static int ttm_alloc_new_pages(struct list_head *pages, gfp_t gfp_flags, r = ttm_set_pages_caching(caching_array, cstate, cpages); if (r) { - ttm_handle_caching_state_failure(pages, - ttm_flags, cstate, - caching_array, cpages); + ttm_handle_caching_failure(caching_array, + cpages); goto out; } cpages = 0; @@ -555,9 +553,7 @@ static int ttm_alloc_new_pages(struct list_head *pages, gfp_t gfp_flags, if (cpages) { r = ttm_set_pages_caching(caching_array, cstate, cpages); if (r) - ttm_handle_caching_state_failure(pages, - ttm_flags, cstate, - caching_array, cpages); + ttm_handle_caching_failure(caching_array, cpages); } out: kfree(caching_array);