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 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 0DBA7C02196 for ; Thu, 6 Feb 2025 23:23:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B81CF10E9B1; Thu, 6 Feb 2025 23:23:55 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="YTORyAx6"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3BF9910E9B1 for ; Thu, 6 Feb 2025 23:23:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1738884236; x=1770420236; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ojq0w+QpGfrSNxzkliFDOUj9P45fP+/x7YIDACC09ng=; b=YTORyAx6Y3kf6P8wmDiFj17HFom3rpS+koPosXYiQkeZRZM9eQRJk/SE Fbhq7dsAp/mmRm4qnn0Q5m+gt8h6Eu7j9Kjy7Jn3zkmtwEVD27GDhTlru 4oCDBGdIm0CnQcHeOJHp6d0VqLC5EsRrdJRAiG1T/AY/p2VEyLCl2c4Ey 98GR3T/W79bvh293/dO6PP4TaT6/VSRjhQZot8k4ym+E/IXuCllSrUUlW TztsdX0QZu21M39CIlAvgARRpUriP0mc0poUy0KuBvjBfqRDlyONqSY4P SRLSbqpUwxUNHNsOtoImii/LLnOzCrSlY4dU/TFmG9X/oIDqvPN9A38FT A==; X-CSE-ConnectionGUID: BaWFgBN/RqeA/Jm986gqWw== X-CSE-MsgGUID: uA0/cut3QvC6S05fWTGIBw== X-IronPort-AV: E=McAfee;i="6700,10204,11336"; a="61993718" X-IronPort-AV: E=Sophos;i="6.13,265,1732608000"; d="scan'208";a="61993718" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Feb 2025 15:23:55 -0800 X-CSE-ConnectionGUID: q2nzlgkRQ5GUJ8KJnj3FyQ== X-CSE-MsgGUID: x+YzbnfnQUWcyyDKOMsbEQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="134594785" Received: from lucas-s2600cw.jf.intel.com ([10.165.21.196]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Feb 2025 15:23:54 -0800 From: Lucas De Marchi To: Cc: Rodrigo Vivi , Francois Dugast , Lucas De Marchi Subject: [PATCH v2 02/14] drm/xe: Fix error handling in xe_irq_install() Date: Thu, 6 Feb 2025 15:23:20 -0800 Message-ID: <20250206232333.2660325-3-lucas.demarchi@intel.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250206232333.2660325-1-lucas.demarchi@intel.com> References: <20250206232333.2660325-1-lucas.demarchi@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" When devm_add_action_or_reset() fails, it already calls the function passed as parameter and that function is already free'ing the irqs. Drop the goto and just return. The caller, xe_device_probe(), should also do the same thing instead of wrongly doing `goto err` and calling the unrelated xe_display_fini() function. Fixes: 14d25d8d684d ("drm/xe: change old msi irq api to a new one") Reviewed-by: Rodrigo Vivi Signed-off-by: Lucas De Marchi --- drivers/gpu/drm/xe/xe_irq.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_irq.c b/drivers/gpu/drm/xe/xe_irq.c index bf092e6391c7d..5362d3174b060 100644 --- a/drivers/gpu/drm/xe/xe_irq.c +++ b/drivers/gpu/drm/xe/xe_irq.c @@ -775,19 +775,7 @@ int xe_irq_install(struct xe_device *xe) xe_irq_postinstall(xe); - err = devm_add_action_or_reset(xe->drm.dev, irq_uninstall, xe); - if (err) - goto free_irq_handler; - - return 0; - -free_irq_handler: - if (xe_device_has_msix(xe)) - xe_irq_msix_free(xe); - else - xe_irq_msi_free(xe); - - return err; + return devm_add_action_or_reset(xe->drm.dev, irq_uninstall, xe); } static void xe_irq_msi_synchronize_irq(struct xe_device *xe) -- 2.48.1