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 00D56D206A7 for ; Thu, 4 Dec 2025 14:32:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8EBF610E1E6; Thu, 4 Dec 2025 14:32:43 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="EXPRQVum"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7AFEF10E1E6; Thu, 4 Dec 2025 14:32:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1764858762; x=1796394762; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=AP+tFOFMb7tLHdR6H8tQy5rxpRtj1oXkbLSuBwdS758=; b=EXPRQVumvM69LwKEAA7j37BGrjZh4YoZTzI04oFq1qd/PzgZvHm7xZp3 N6AFWa+0OVnpjWBJ7mXae/pZxfSodgVBhDO2TcQAooJXsV4W5XmqCr78M WA51azaGny2oTFc7sZaBem0QB1gPul0c+uf05eHGN2iNVjAiEadwvVZic hLnrLhEsn5ibwEl/Lm8mLaQQMV9DUs8O04KHn9ihER+JdA81+6UxPuhx5 qtgrBccIpWa6q0NAu9xbZ0ObvdSqdNn/xOl8QzwUDF9r5ILIjqu6Otbce 3ma26MvZhT0YtXKibe9W5ItvdiAyYz+pMKbKxXFjs+vn17KobVj0eqGA8 Q==; X-CSE-ConnectionGUID: lQDzzsPmSQ+roy72v9Mciw== X-CSE-MsgGUID: WPBp+FT9Th61wZzSIM48BA== X-IronPort-AV: E=McAfee;i="6800,10657,11632"; a="66599476" X-IronPort-AV: E=Sophos;i="6.20,249,1758610800"; d="scan'208";a="66599476" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Dec 2025 06:32:41 -0800 X-CSE-ConnectionGUID: Kb0Tg2uaRrqRrAeKo55MvA== X-CSE-MsgGUID: o/HYBJF1SoqZG9jKqGaf/A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.20,249,1758610800"; d="scan'208";a="195424634" Received: from mjarzebo-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.246.11]) by fmviesa009-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Dec 2025 06:32:39 -0800 From: Jani Nikula To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Cc: jani.nikula@intel.com Subject: [PATCH] drm/i915/crtc: move crtc initialization loop to intel_crtc.c Date: Thu, 4 Dec 2025 16:32:35 +0200 Message-ID: <20251204143235.3138973-1-jani.nikula@intel.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - c/o Alberga Business Park, 6 krs Bertel Jungin Aukio 5, 02600 Espoo, Finland Content-Transfer-Encoding: 8bit X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" intel_display_driver_probe_nogem() is too high of an abstraction level to be looping and initializing individual CRTCs. Move this to intel_crtc.c and repurpose intel_crtc_init() to initialize all CRTCs. Make the original a static __intel_crtc_init() for ininitializing a single CRTC. Signed-off-by: Jani Nikula --- This is prep for doing [1] in a nicer way, without divulging the details at the high level. [1] https://lore.kernel.org/r/20251119153321.2640969-1-jani.nikula@intel.com --- drivers/gpu/drm/i915/display/intel_crtc.c | 19 ++++++++++++++++++- drivers/gpu/drm/i915/display/intel_crtc.h | 2 +- .../drm/i915/display/intel_display_driver.c | 13 +++---------- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c b/drivers/gpu/drm/i915/display/intel_crtc.c index 5e1e02c8d9d4..778ebc5095c3 100644 --- a/drivers/gpu/drm/i915/display/intel_crtc.c +++ b/drivers/gpu/drm/i915/display/intel_crtc.c @@ -308,7 +308,7 @@ static const struct drm_crtc_funcs i8xx_crtc_funcs = { .get_vblank_timestamp = intel_crtc_get_vblank_timestamp, }; -int intel_crtc_init(struct intel_display *display, enum pipe pipe) +static int __intel_crtc_init(struct intel_display *display, enum pipe pipe) { struct intel_plane *primary, *cursor; const struct drm_crtc_funcs *funcs; @@ -406,6 +406,23 @@ int intel_crtc_init(struct intel_display *display, enum pipe pipe) return ret; } +int intel_crtc_init(struct intel_display *display) +{ + enum pipe pipe; + int ret; + + drm_dbg_kms(display->drm, "%d display pipe%s available.\n", + INTEL_NUM_PIPES(display), str_plural(INTEL_NUM_PIPES(display))); + + for_each_pipe(display, pipe) { + ret = __intel_crtc_init(display, pipe); + if (ret) + return ret; + } + + return 0; +} + int intel_crtc_get_pipe_from_crtc_id_ioctl(struct drm_device *dev, void *data, struct drm_file *file) { diff --git a/drivers/gpu/drm/i915/display/intel_crtc.h b/drivers/gpu/drm/i915/display/intel_crtc.h index 07917e8a9ae3..12507b51ee77 100644 --- a/drivers/gpu/drm/i915/display/intel_crtc.h +++ b/drivers/gpu/drm/i915/display/intel_crtc.h @@ -37,7 +37,7 @@ void intel_crtc_arm_vblank_event(struct intel_crtc_state *crtc_state); void intel_crtc_prepare_vblank_event(struct intel_crtc_state *crtc_state, struct drm_pending_vblank_event **event); u32 intel_crtc_max_vblank_count(const struct intel_crtc_state *crtc_state); -int intel_crtc_init(struct intel_display *display, enum pipe pipe); +int intel_crtc_init(struct intel_display *display); int intel_crtc_get_pipe_from_crtc_id_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv); struct intel_crtc_state *intel_crtc_state_alloc(struct intel_crtc *crtc); diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c index 7e000ba3e08b..e282b533d5b6 100644 --- a/drivers/gpu/drm/i915/display/intel_display_driver.c +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c @@ -452,7 +452,6 @@ bool intel_display_driver_check_access(struct intel_display *display) /* part #2: call after irq install, but before gem init */ int intel_display_driver_probe_nogem(struct intel_display *display) { - enum pipe pipe; int ret; if (!HAS_DISPLAY(display)) @@ -466,15 +465,9 @@ int intel_display_driver_probe_nogem(struct intel_display *display) intel_gmbus_setup(display); - drm_dbg_kms(display->drm, "%d display pipe%s available.\n", - INTEL_NUM_PIPES(display), - INTEL_NUM_PIPES(display) > 1 ? "s" : ""); - - for_each_pipe(display, pipe) { - ret = intel_crtc_init(display, pipe); - if (ret) - goto err_mode_config; - } + ret = intel_crtc_init(display); + if (ret) + goto err_mode_config; intel_plane_possible_crtcs_init(display); intel_dpll_init(display); -- 2.47.3