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 C3D69E77180 for ; Tue, 10 Dec 2024 09:36:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 88EEC10E849; Tue, 10 Dec 2024 09:36:03 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="fiB70eS3"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) by gabe.freedesktop.org (Postfix) with ESMTPS id 78BC110E854; Tue, 10 Dec 2024 09:36:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1733823362; x=1765359362; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=aStncA1iyIQzIUi8IjV1c0NYxhg/DY9aiTLGa4QBM8Y=; b=fiB70eS3T4f+XIEaFxrxr1JE8lDIw9NcuaHmbnKazs59dIC2r1XqwsVw c2cZ7yW/C0aWxNsNWvfIctw9xlxZtZJJ3jnEX1vTjl/0InMKMAwtl03/s wXoy/yS7lobr9zZNBCHTsdHzBShwq2irOhJo17Cxo/Z0qIHiLVW8ZZKFg ll+386nqAkzR+SWonblqaJaPZzUC5SIKRTWLMPaV5EILLdOoIbT0+iG57 8kj3JXATi/0tMLhBF1sJUeVbAgAsEhyFNLSolHzSm9I7tcZvZr9LqWAts ibzgatijG1e+m57prvTfwiPxFPY7/3SvF/y9is4jJOBuQhSNbiUJhgny5 A==; X-CSE-ConnectionGUID: c8YVgh5eRqSouapQ+lNlWA== X-CSE-MsgGUID: f6WO0WgIQL6hIoGT2BaM5Q== X-IronPort-AV: E=McAfee;i="6700,10204,11281"; a="33493269" X-IronPort-AV: E=Sophos;i="6.12,222,1728975600"; d="scan'208";a="33493269" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Dec 2024 01:36:02 -0800 X-CSE-ConnectionGUID: nEAPm4knR+yadcQpBrBXLg== X-CSE-MsgGUID: xV4421D0Qh6DxASWMNZFZg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,222,1728975600"; d="scan'208";a="100395790" Received: from mjarzebo-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.246.242]) by orviesa004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Dec 2024 01:36:00 -0800 From: Jani Nikula To: Maarten Lankhorst , intel-xe@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org, Maarten Lankhorst , Rodrigo Vivi Subject: Re: [PATCH] drm/xe/display: Use a single early init call for display In-Reply-To: <20241209155142.209657-1-dev@lankhorst.se> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20241206185956.3290-6-dev@lankhorst.se> <20241209155142.209657-1-dev@lankhorst.se> Date: Tue, 10 Dec 2024 11:35:56 +0200 Message-ID: <87h67bzxqb.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain 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" On Mon, 09 Dec 2024, Maarten Lankhorst wrote: > Instead of 3 different calls, it should be safe to unify to a single > call now. This makes the init sequence cleaner, and display less > tangled. Needs more explanation. I thought the goal was to *unify* i915 and xe display init/cleanup. This diverges them more, with actually functionally different things rather than just slightly different ordering. BR, Jani. > > Reviewed-by: Rodrigo Vivi > Signed-off-by: Maarten Lankhorst > --- > Rebase > > drivers/gpu/drm/xe/display/xe_display.c | 73 +++++++------------------ > drivers/gpu/drm/xe/display/xe_display.h | 8 +-- > drivers/gpu/drm/xe/xe_device.c | 10 +--- > 3 files changed, 22 insertions(+), 69 deletions(-) > > diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c > index 317fa66adf189..b013a4db11183 100644 > --- a/drivers/gpu/drm/xe/display/xe_display.c > +++ b/drivers/gpu/drm/xe/display/xe_display.c > @@ -101,19 +101,25 @@ int xe_display_create(struct xe_device *xe) > return drmm_add_action_or_reset(&xe->drm, display_destroy, NULL); > } > > -static void xe_display_fini_nommio(struct drm_device *dev, void *dummy) > +static void xe_display_fini_early(void *arg) > { > - struct xe_device *xe = to_xe_device(dev); > + struct xe_device *xe = arg; > struct intel_display *display = &xe->display; > > if (!xe->info.probe_display) > return; > > + intel_display_driver_remove_nogem(display); > + intel_display_driver_remove_noirq(display); > + intel_opregion_cleanup(display); > intel_power_domains_cleanup(display); > } > > -int xe_display_init_nommio(struct xe_device *xe) > +int xe_display_init_early(struct xe_device *xe) > { > + struct intel_display *display = &xe->display; > + int err; > + > if (!xe->info.probe_display) > return 0; > > @@ -123,29 +129,6 @@ int xe_display_init_nommio(struct xe_device *xe) > /* This must be called before any calls to HAS_PCH_* */ > intel_detect_pch(xe); > > - return drmm_add_action_or_reset(&xe->drm, xe_display_fini_nommio, xe); > -} > - > -static void xe_display_fini_noirq(void *arg) > -{ > - struct xe_device *xe = arg; > - struct intel_display *display = &xe->display; > - > - if (!xe->info.probe_display) > - return; > - > - intel_display_driver_remove_noirq(display); > - intel_opregion_cleanup(display); > -} > - > -int xe_display_init_noirq(struct xe_device *xe) > -{ > - struct intel_display *display = &xe->display; > - int err; > - > - if (!xe->info.probe_display) > - return 0; > - > intel_display_driver_early_probe(display); > > /* Early display init.. */ > @@ -162,38 +145,20 @@ int xe_display_init_noirq(struct xe_device *xe) > intel_display_device_info_runtime_init(display); > > err = intel_display_driver_probe_noirq(display); > - if (err) { > - intel_opregion_cleanup(display); > - return err; > - } > - > - return devm_add_action_or_reset(xe->drm.dev, xe_display_fini_noirq, xe); > -} > - > -static void xe_display_fini_noaccel(void *arg) > -{ > - struct xe_device *xe = arg; > - struct intel_display *display = &xe->display; > - > - if (!xe->info.probe_display) > - return; > - > - intel_display_driver_remove_nogem(display); > -} > - > -int xe_display_init_noaccel(struct xe_device *xe) > -{ > - struct intel_display *display = &xe->display; > - int err; > - > - if (!xe->info.probe_display) > - return 0; > + if (err) > + goto err_opregion; > > err = intel_display_driver_probe_nogem(display); > if (err) > - return err; > + goto err_noirq; > > - return devm_add_action_or_reset(xe->drm.dev, xe_display_fini_noaccel, xe); > + return devm_add_action_or_reset(xe->drm.dev, xe_display_fini_early, xe); > +err_noirq: > + intel_display_driver_remove_noirq(display); > + intel_power_domains_cleanup(display); > +err_opregion: > + intel_opregion_cleanup(display); > + return err; > } > > int xe_display_init(struct xe_device *xe) > diff --git a/drivers/gpu/drm/xe/display/xe_display.h b/drivers/gpu/drm/xe/display/xe_display.h > index 233f81a26c255..e2a99624f7064 100644 > --- a/drivers/gpu/drm/xe/display/xe_display.h > +++ b/drivers/gpu/drm/xe/display/xe_display.h > @@ -20,9 +20,7 @@ int xe_display_create(struct xe_device *xe); > > int xe_display_probe(struct xe_device *xe); > > -int xe_display_init_nommio(struct xe_device *xe); > -int xe_display_init_noirq(struct xe_device *xe); > -int xe_display_init_noaccel(struct xe_device *xe); > +int xe_display_init_early(struct xe_device *xe); > int xe_display_init(struct xe_device *xe); > void xe_display_fini(struct xe_device *xe); > > @@ -54,9 +52,7 @@ static inline int xe_display_create(struct xe_device *xe) { return 0; } > > static inline int xe_display_probe(struct xe_device *xe) { return 0; } > > -static inline int xe_display_init_nommio(struct xe_device *xe) { return 0; } > -static inline int xe_display_init_noirq(struct xe_device *xe) { return 0; } > -static inline int xe_display_init_noaccel(struct xe_device *xe) { return 0; } > +static inline int xe_display_init_early(struct xe_device *xe) { return 0; } > static inline int xe_display_init(struct xe_device *xe) { return 0; } > static inline void xe_display_fini(struct xe_device *xe) {} > > diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c > index fbec176ee64ad..c9c0b74c74ddb 100644 > --- a/drivers/gpu/drm/xe/xe_device.c > +++ b/drivers/gpu/drm/xe/xe_device.c > @@ -639,10 +639,6 @@ int xe_device_probe(struct xe_device *xe) > return err; > > xe->info.mem_region_mask = 1; > - err = xe_display_init_nommio(xe); > - if (err) > - return err; > - > err = xe_set_dma_info(xe); > if (err) > return err; > @@ -697,10 +693,6 @@ int xe_device_probe(struct xe_device *xe) > if (err) > return err; > > - err = xe_display_init_noirq(xe); > - if (err) > - return err; > - > err = probe_has_flat_ccs(xe); > if (err) > goto err; > @@ -724,7 +716,7 @@ int xe_device_probe(struct xe_device *xe) > * This is the reason the first allocation needs to be done > * inside display. > */ > - err = xe_display_init_noaccel(xe); > + err = xe_display_init_early(xe); > if (err) > goto err; -- Jani Nikula, Intel