From patchwork Thu Feb 6 08:17:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 13962595 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 53CC7C02196 for ; Thu, 6 Feb 2025 08:19:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AC53810E1D4; Thu, 6 Feb 2025 08:19:06 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="EPr79xPC"; dkim-atps=neutral Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1F0B810E7F3 for ; Thu, 6 Feb 2025 08:17:08 +0000 (UTC) Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-388cae9eb9fso265662f8f.3 for ; Thu, 06 Feb 2025 00:17:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738829826; x=1739434626; darn=lists.freedesktop.org; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=ubql9r1omCt43g1m4gjLWGeKKiFiLncoJpuHUqF935k=; b=EPr79xPCrfaXbagBBBE8uMIJG6tdfuTcspkUhE5tGPvTAqV6G9b8osCeEkCTygOxc9 9TMT8nXCLGpFf29bhpHFlK0wDnEgzYaw6kjyFTeE0fWZ/dj9DgzKeLXNt3/Yb8XfQIP8 J41xuRmfn5xSZ/ceL2uzCtF6dreLz8ed6y+S256TqVEqrIO7sJf1i4Lh5Zi0SYyGYItk scAxx9hKIU4lRIVcjeCSUzJM53xuTJbAcTJ5BRqmV4rL7Gh9ADaE4QeSAFfKho48NWmJ iQLVPuu7tdTsjeeoOyreoneFWwH2aKPSyJl1/60gOe293gkIRtgWezfQMRw8A8/BLd+j vaEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738829826; x=1739434626; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ubql9r1omCt43g1m4gjLWGeKKiFiLncoJpuHUqF935k=; b=lEZhjt/38z3R9IuHga8ScbEVF+GpIFue13eQ66jMaRYi3I3fm6q3fobcwOVZR6A8fJ DKT5ABYJFB8ZcK3+5vZYTha1VXzWqt/ISyRj2KrzD0r9Tt5kLe1z9chlUGzP9YsD2BWz flyrPKljJknB+XfXeX2gtJmCrGAeMo2cSmihk1/vTtTq6Ao1UTs1XCDGiUvFOP/nVELm NjqbaQIJFCyLFByyX/SMPIFsz3x6Bb5wv8JcLeJTYGqAg8GI+FlQO7MBrjDtlWRcXC9N uH+IvypHx6eZhPtXOLTBYc7q50FSRnAfKuh1+jGowKR1nJ1An+LbF5pwgKNlzj6GzjjC s8cg== X-Forwarded-Encrypted: i=1; AJvYcCVdV0U60O114AchJYNebQC1Kp4Iu9sCz/6gMA+SDZiAZFRwZINBDTUq6g3KFntQt+CVyzC/rFkoGNo=@lists.freedesktop.org X-Gm-Message-State: AOJu0YyVrAO2aortEHM8UkDm8A1x9CuTr12hyzawKku7751Qqwc8IfeX pEREUUGsHRyXmAb3iHAs95m40N6wVJgf6bx7yX7wpYL6O9LlbME32Qr0xU0aekk= X-Gm-Gg: ASbGncuxrV139Hsny3jLgym5XYKvVYLnkp4oFFcn1+QHGWI8iLqXXM/6n6LAotmz0bL JpwojxCQaRr3maYrcth1Z/LUYMbfLQbQ60wtSu3BCHOGpbjgtgRSsjkPV3KalyiSdfM6M6DXBWc g+BA7BB9Obo0ql2CMKr7LyJUnYQBmuEBF4qq1FgQH6QOhH12xT3STCh6qBsCEKAsrOEvG//rzl2 F/kg8UC5tYm4ZvijJRLidoHYkOC3Oy50qdF67qDb/1sTnzhuFvhMGeG0tG1K2hXTFzoztgs9tgY bDzSoVgzc24cYR62uIwp X-Google-Smtp-Source: AGHT+IF7c/c3cT8gIKlZmV09tdvJuSUhNmFcmUl5w0RwgKRFabBb32VFjSdJlhbFnDoNrb4CYnO3Bw== X-Received: by 2002:a5d:64ec:0:b0:385:f7a3:fea6 with SMTP id ffacd0b85a97d-38db48ba435mr3619651f8f.13.1738829826339; Thu, 06 Feb 2025 00:17:06 -0800 (PST) Received: from localhost ([196.207.164.177]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-38dbde1de32sm1040103f8f.83.2025.02.06.00.17.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2025 00:17:05 -0800 (PST) Date: Thu, 6 Feb 2025 11:17:02 +0300 From: Dan Carpenter To: "Kirill A. Shutemov" Cc: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Simona Vetter , Andrew Morton , Andi Shyti , David Hildenbrand , Josef Bacik , "Matthew Wilcox (Oracle)" , Brian Geffon , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH next] drm/i915: Fix NULL vs IS_ERR() check in __shmem_writeback() Message-ID: <7f99a56b-d517-40b0-92b7-421c4fd813f2@stanley.mountain> MIME-Version: 1.0 Content-Disposition: inline X-Mailer: git-send-email haha only kidding 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" The filemap_lock_folio() function doesn't return NULL, it returns error pointers. Fixes: 25dd342f0cc8 ("drm/i915/gem: convert __shmem_writeback() to folios") Signed-off-by: Dan Carpenter Reviewed-by: Andi Shyti --- drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c index a784fb44e59c..fb263b421958 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c @@ -319,7 +319,7 @@ void __shmem_writeback(size_t size, struct address_space *mapping) struct folio *folio; folio = filemap_lock_folio(mapping, i); - if (!folio) + if (IS_ERR(folio)) continue; if (!folio_mapped(folio) && folio_clear_dirty_for_io(folio)) {