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 2D4A3C25B7A for ; Wed, 22 May 2024 10:23:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B234110E954; Wed, 22 May 2024 10:22:59 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="DyKJg2Oy"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id 672A510F492 for ; Wed, 22 May 2024 10:22:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716373339; x=1747909339; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=1k+HrhOaQNOcD1XinUfrdR+K1Ud/c1Vd5Dk9hyPRJDA=; b=DyKJg2OyIl+Vo6/to4wBxFt8spfF5iDBgHASq+7780bR0VFrs2N34Pb6 5YAEHJRxrhIYrblZbqtNlOfSBpnwZQ+DInP0qj2IqgtDQhrPxwturccvH v1QkHshkrpSMzHHmQVm6jZe7LM4mhTrxLFnpsg5IWi2EIxSOrmwWMCHKy /jibkXMZwOg2qdX8htqxljF7Bl/qVEm+NXMRQS30V3DAQKcHqeqjx5Rst dODUpEfIST5ZFLbesA2u7NZLBQHXy8t3mL+NJieDrcLBCi4n8VHx0SagM prOudlExtXafbIJq7Q4/E0cWpFaMDayMQUe6IjmV46xD/06LP0WkVC7MQ Q==; X-CSE-ConnectionGUID: TJhrugS7QqSoVOoLZ8lEkQ== X-CSE-MsgGUID: ZAYTgqinTgaLlNzEmpZfvg== X-IronPort-AV: E=McAfee;i="6600,9927,11079"; a="15562709" X-IronPort-AV: E=Sophos;i="6.08,179,1712646000"; d="scan'208";a="15562709" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 May 2024 03:22:19 -0700 X-CSE-ConnectionGUID: rm5/604DSluwGfpMFftiZA== X-CSE-MsgGUID: o3wJ/rf4ScKj7Gm0wDjhyA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,179,1712646000"; d="scan'208";a="38195337" Received: from unknown (HELO mwauld-desk.intel.com) ([10.245.245.124]) by orviesa004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 May 2024 03:22:18 -0700 From: Matthew Auld To: intel-xe@lists.freedesktop.org Subject: [CI v3 16/18] drm/xe/display: move display fini stuff to devm Date: Wed, 22 May 2024 11:21:59 +0100 Message-ID: <20240522102143.128069-34-matthew.auld@intel.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240522102143.128069-19-matthew.auld@intel.com> References: <20240522102143.128069-19-matthew.auld@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" Match the i915 display handling here with calling both no_irq and noaccel when removing the device. Signed-off-by: Matthew Auld Cc: Andrzej Hajda Cc: Rodrigo Vivi Reviewed-by: Andrzej Hajda --- drivers/gpu/drm/xe/display/xe_display.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c index a2c39bcc7677..18fffa894f7d 100644 --- a/drivers/gpu/drm/xe/display/xe_display.c +++ b/drivers/gpu/drm/xe/display/xe_display.c @@ -123,9 +123,9 @@ int xe_display_init_nommio(struct xe_device *xe) return drmm_add_action_or_reset(&xe->drm, xe_display_fini_nommio, xe); } -static void xe_display_fini_noirq(struct drm_device *dev, void *dummy) +static void xe_display_fini_noirq(void *arg) { - struct xe_device *xe = to_xe_device(dev); + struct xe_device *xe = arg; if (!xe->info.enable_display) return; @@ -160,12 +160,12 @@ int xe_display_init_noirq(struct xe_device *xe) if (err) return err; - return drmm_add_action_or_reset(&xe->drm, xe_display_fini_noirq, NULL); + return devm_add_action_or_reset(xe->drm.dev, xe_display_fini_noirq, xe); } -static void xe_display_fini_noaccel(struct drm_device *dev, void *dummy) +static void xe_display_fini_noaccel(void *arg) { - struct xe_device *xe = to_xe_device(dev); + struct xe_device *xe = arg; if (!xe->info.enable_display) return; @@ -184,7 +184,7 @@ int xe_display_init_noaccel(struct xe_device *xe) if (err) return err; - return drmm_add_action_or_reset(&xe->drm, xe_display_fini_noaccel, NULL); + return devm_add_action_or_reset(xe->drm.dev, xe_display_fini_noaccel, xe); } int xe_display_init(struct xe_device *xe) -- 2.45.1