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=-10.8 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 3E54FC4363A for ; Mon, 5 Oct 2020 16:03:39 +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 CE0DC206DD for ; Mon, 5 Oct 2020 16:03:38 +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="bbPR7U0f" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CE0DC206DD 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 C0F456E090; Mon, 5 Oct 2020 16:03:37 +0000 (UTC) Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by gabe.freedesktop.org (Postfix) with ESMTPS id DF9B06E090 for ; Mon, 5 Oct 2020 16:03:36 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id k10so10197483wru.6 for ; Mon, 05 Oct 2020 09:03:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=jeqnhc2N5T9rlVWAzTis3gMt6Y6yUtPh2doG+rLKNTI=; b=bbPR7U0fyhsxh5v/m/lorbumPYbvJPWcqXsT8JJmfpHnJ0WaT9RQ++1BQwztfFMsoU vNkaOIn7n+Yh4rXeVKCZnr8y4uTCjdS9A8tZcOdFgOVjXtV3asahjeQoUuCcIt0OyGGv tTTW4wheBv6WKDALZxKciZbyD0rnv8D24Xb6rIrb6AW3Snvz4q8hejF3n6r1kO0P9Rzb Gtb7S4emyaXEbKuYFPriC/SfIMEJnVQpGo4TWispI5OSJYCmMiXYvecgyBQBOYjAGH5v iCnw7tGpni3fjp6D2S5fPWQHJm1zdAIJ6DGCmLhPfCoxKflBFNv2MgxqYEBwaLTdrTZg f44A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=jeqnhc2N5T9rlVWAzTis3gMt6Y6yUtPh2doG+rLKNTI=; b=HHiXMlytHaTutoim2KJ429OJC1q3fGr+IcnfdUO/VuMNOFSetT/GcfBcp6CiO2jNHy d8ssczSwQHz9ovm9SQON848pScDA2kfal7koYmietWFa7b630ybfu6M7RwRK74j1ilc0 P+sl00/1uugLdO4HLutStfDaciJvLneIO2iFLyVE4r2gGWn+k9k6qFheisTxkocUgjUK d/y/mPS9Ve7sGiN7vszcXnXOacNdCmeqZjj3LVrWnSjkxmOjaL+xZcYMXPDjSlxd4pJT 76Qnrs4TocjkRZ/F1WjRRbozXe63WAWlE1IIP0jJOQ1haXdZmSJZLdg/KEh0H7bIYWsM 8NqA== X-Gm-Message-State: AOAM530kclEVo5wi6pgILARX+Wpu+rh+US1gKMRkELz6byJQq/DsHH45 x21xFdZzfycUA9Br9XuuFkWCV1wDBnA= X-Google-Smtp-Source: ABdhPJwt3UrbruF8bmK4GFwLiN2e6hIYPPKUGC7ynDoy9J7LCG6dPseTDzGuv/lGqi75Nee0NdqWcQ== X-Received: by 2002:adf:fd90:: with SMTP id d16mr115846wrr.52.1601913814728; Mon, 05 Oct 2020 09:03:34 -0700 (PDT) Received: from [192.168.1.125] (46-126-183-173.dynamic.hispeed.ch. [46.126.183.173]) by smtp.gmail.com with ESMTPSA id f14sm516476wrt.53.2020.10.05.09.03.33 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 05 Oct 2020 09:03:34 -0700 (PDT) Subject: Re: [PATCH AUTOSEL 5.8 10/12] drm/vmwgfx: Fix error handling in get_node To: Sasha Levin , linux-kernel@vger.kernel.org, stable@vger.kernel.org References: <20201005144501.2527477-1-sashal@kernel.org> <20201005144501.2527477-10-sashal@kernel.org> From: Roland Scheidegger Message-ID: <73db41ac-4a87-aa99-d03c-7391fd0390c2@gmail.com> Date: Mon, 5 Oct 2020 18:03:31 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Firefox/68.0 Thunderbird/68.11.0 MIME-Version: 1.0 In-Reply-To: <20201005144501.2527477-10-sashal@kernel.org> Content-Language: de-DE 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: Martin Krastev , Roland Scheidegger , dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Not entirely sure how the patches for autosel were selected, but this patch is no good for 5.8, since the patch which introduced the breakage in the first place is only in 5.9 (in particular it was 58e4d686d456c3e356439ae160ff4a0728940b8e, drm/ttm: cleanup ttm_mem_type_manager_func.get_node interface v3), and at least I don't see that one being backported to 5.8. Roland Am 05.10.20 um 16:44 schrieb Sasha Levin: > From: Zack Rusin > > [ Upstream commit f54c4442893b8dfbd3aff8e903c54dfff1aef990 ] > > ttm_mem_type_manager_func.get_node was changed to return -ENOSPC > instead of setting the node pointer to NULL. Unfortunately > vmwgfx still had two places where it was explicitly converting > -ENOSPC to 0 causing regressions. This fixes those spots by > allowing -ENOSPC to be returned. That seems to fix recent > regressions with vmwgfx. > > Signed-off-by: Zack Rusin > Reviewed-by: Roland Scheidegger > Reviewed-by: Martin Krastev > Sigend-off-by: Roland Scheidegger > Signed-off-by: Sasha Levin > --- > drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 2 +- > drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c > index 7da752ca1c34b..b93c558dd86e0 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c > @@ -57,7 +57,7 @@ static int vmw_gmrid_man_get_node(struct ttm_mem_type_manager *man, > > id = ida_alloc_max(&gman->gmr_ida, gman->max_gmr_ids - 1, GFP_KERNEL); > if (id < 0) > - return (id != -ENOMEM ? 0 : id); > + return id; > > spin_lock(&gman->lock); > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c b/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c > index b7c816ba71663..c8b9335bccd8d 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c > @@ -95,7 +95,7 @@ static int vmw_thp_get_node(struct ttm_mem_type_manager *man, > mem->start = node->start; > } > > - return 0; > + return ret; > } > > > _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel