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 0464CC0219B for ; Tue, 11 Feb 2025 12:59:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9E79610E6B4; Tue, 11 Feb 2025 12:59:07 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="dE7Of4WL"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by gabe.freedesktop.org (Postfix) with ESMTPS id DFFD410E6B4; Tue, 11 Feb 2025 12:59:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1739278747; x=1770814747; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=nvwLZDTt2jfRLXXXLpbAg2bbBLLGzD2vfd38YRI2Bs8=; b=dE7Of4WLwtxtuI1qc/+00SDlOtCm3DqqmHzqR4vv16EqRAvyakhLqtBh wo3SY1AzeZkf4edP5DciOeLtNuRyIMKyN2RhpaquywxbFFBqqXggJ31yz TuotRN9KEg/FfiJ/eEY3dB0n4hVuU3aV0liYCLnURL30foSWZojNfmgx4 Ac1nIIw896Bz7zTTbZkg4U5C9zUX2+1hXNB6xrhZeAepGu5UOG7sGs9J8 q6VNMYuUMZr+iPURR8nckstyaQ3t5UU6rjZdZljZ3qV5Gb3MpHRg4kM6M SMTySOdtQuC5RpGsh3gtLwS7kmUYOfzdejXOv+bfkQYdM49PFhkuddBN1 A==; X-CSE-ConnectionGUID: L0MMHl+GSByRVFWITurfvA== X-CSE-MsgGUID: w0mNGTCfT3upNPG4HkkwVw== X-IronPort-AV: E=McAfee;i="6700,10204,11341"; a="27494744" X-IronPort-AV: E=Sophos;i="6.13,277,1732608000"; d="scan'208";a="27494744" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Feb 2025 04:59:06 -0800 X-CSE-ConnectionGUID: Pa8nwdpCTOKinkA/HNYuTQ== X-CSE-MsgGUID: KcslM75SSZuCFZ2UsrnN6g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="117693214" Received: from ncintean-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.246.93]) by orviesa005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Feb 2025 04:59:03 -0800 From: Jani Nikula To: Suraj Kandpal , intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: ankit.k.nautiyal@intel.com, Suraj Kandpal Subject: Re: [PATCH 4/9] drm/i915/dpll: Use intel_display for dpll dump and compare hw state In-Reply-To: <20250211104857.3501566-5-suraj.kandpal@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20250211104857.3501566-1-suraj.kandpal@intel.com> <20250211104857.3501566-5-suraj.kandpal@intel.com> Date: Tue, 11 Feb 2025 14:59:01 +0200 Message-ID: <87wmdw1vu2.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 Tue, 11 Feb 2025, Suraj Kandpal wrote: > Lets use intel_display for dpll dump and compare hw state. This also *Let's > helps elimanate drm_i915_private dependency from i915_shared_dplls_info > in display_debug_fs. There's no display_debug_fs... Reviewed-by: Jani Nikula > > Signed-off-by: Suraj Kandpal > --- > .../gpu/drm/i915/display/intel_crtc_state_dump.c | 3 ++- > drivers/gpu/drm/i915/display/intel_display.c | 8 ++++---- > .../gpu/drm/i915/display/intel_display_debugfs.c | 3 +-- > drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 16 ++++++++-------- > drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 4 ++-- > 5 files changed, 17 insertions(+), 17 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c b/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c > index ecd0d9853c60..599ddce96371 100644 > --- a/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c > +++ b/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c > @@ -176,6 +176,7 @@ void intel_crtc_state_dump(const struct intel_crtc_state *pipe_config, > struct intel_atomic_state *state, > const char *context) > { > + struct intel_display *display = to_intel_display(pipe_config); > struct intel_crtc *crtc = to_intel_crtc(pipe_config->uapi.crtc); > struct drm_i915_private *i915 = to_i915(crtc->base.dev); > const struct intel_plane_state *plane_state; > @@ -340,7 +341,7 @@ void intel_crtc_state_dump(const struct intel_crtc_state *pipe_config, > pipe_config->ips_enabled, pipe_config->double_wide, > pipe_config->has_drrs); > > - intel_dpll_dump_hw_state(i915, &p, &pipe_config->dpll_hw_state); > + intel_dpll_dump_hw_state(display, &p, &pipe_config->dpll_hw_state); > > if (IS_CHERRYVIEW(i915)) > drm_printf(&p, "cgm_mode: 0x%x gamma_mode: 0x%x gamma_enable: %d csc_enable: %d\n", > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index 9f8a8c94cf4c..5f4b1d8eed3e 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -5348,14 +5348,14 @@ pipe_config_pll_mismatch(struct drm_printer *p, bool fastset, > const struct intel_dpll_hw_state *a, > const struct intel_dpll_hw_state *b) > { > - struct drm_i915_private *i915 = to_i915(crtc->base.dev); > + struct intel_display *display = to_intel_display(crtc); > > pipe_config_mismatch(p, fastset, crtc, name, " "); /* stupid -Werror=format-zero-length */ > > drm_printf(p, "expected:\n"); > - intel_dpll_dump_hw_state(i915, p, a); > + intel_dpll_dump_hw_state(display, p, a); > drm_printf(p, "found:\n"); > - intel_dpll_dump_hw_state(i915, p, b); > + intel_dpll_dump_hw_state(display, p, b); > } > > static void > @@ -5495,7 +5495,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, > } while (0) > > #define PIPE_CONF_CHECK_PLL(name) do { \ > - if (!intel_dpll_compare_hw_state(dev_priv, ¤t_config->name, \ > + if (!intel_dpll_compare_hw_state(display, ¤t_config->name, \ > &pipe_config->name)) { \ > pipe_config_pll_mismatch(&p, fastset, crtc, __stringify(name), \ > ¤t_config->name, \ > diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > index 87e6f4000101..970b8078db8b 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c > +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > @@ -630,7 +630,6 @@ static int i915_display_capabilities(struct seq_file *m, void *unused) > > static int i915_shared_dplls_info(struct seq_file *m, void *unused) > { > - struct drm_i915_private *dev_priv = node_to_i915(m->private); > struct intel_display *display = node_to_intel_display(m->private); > struct drm_printer p = drm_seq_file_printer(m); > struct intel_shared_dpll *pll; > @@ -649,7 +648,7 @@ static int i915_shared_dplls_info(struct seq_file *m, void *unused) > pll->state.pipe_mask, pll->active_mask, > str_yes_no(pll->on)); > drm_printf(&p, " tracked hardware state:\n"); > - intel_dpll_dump_hw_state(dev_priv, &p, &pll->state.hw_state); > + intel_dpll_dump_hw_state(display, &p, &pll->state.hw_state); > } > drm_modeset_unlock_all(display->drm); > > diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c > index 171d16e91c61..ee4e263ce999 100644 > --- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c > +++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c > @@ -4592,18 +4592,18 @@ void intel_dpll_sanitize_state(struct drm_i915_private *i915) > > /** > * intel_dpll_dump_hw_state - dump hw_state > - * @i915: i915 drm device > + * @display: intel_display structure > * @p: where to print the state to > * @dpll_hw_state: hw state to be dumped > * > * Dumo out the relevant values in @dpll_hw_state. > */ > -void intel_dpll_dump_hw_state(struct drm_i915_private *i915, > +void intel_dpll_dump_hw_state(struct intel_display *display, > struct drm_printer *p, > const struct intel_dpll_hw_state *dpll_hw_state) > { > - if (i915->display.dpll.mgr) { > - i915->display.dpll.mgr->dump_hw_state(p, dpll_hw_state); > + if (display->dpll.mgr) { > + display->dpll.mgr->dump_hw_state(p, dpll_hw_state); > } else { > /* fallback for platforms that don't use the shared dpll > * infrastructure > @@ -4614,7 +4614,7 @@ void intel_dpll_dump_hw_state(struct drm_i915_private *i915, > > /** > * intel_dpll_compare_hw_state - compare the two states > - * @i915: i915 drm device > + * @display: intel_display structure > * @a: first DPLL hw state > * @b: second DPLL hw state > * > @@ -4622,12 +4622,12 @@ void intel_dpll_dump_hw_state(struct drm_i915_private *i915, > * > * Returns: true if the states are equal, false if the differ > */ > -bool intel_dpll_compare_hw_state(struct drm_i915_private *i915, > +bool intel_dpll_compare_hw_state(struct intel_display *display, > const struct intel_dpll_hw_state *a, > const struct intel_dpll_hw_state *b) > { > - if (i915->display.dpll.mgr) { > - return i915->display.dpll.mgr->compare_hw_state(a, b); > + if (display->dpll.mgr) { > + return display->dpll.mgr->compare_hw_state(a, b); > } else { > /* fallback for platforms that don't use the shared dpll > * infrastructure > diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.h b/drivers/gpu/drm/i915/display/intel_dpll_mgr.h > index 382bdf8f0b65..42379494f347 100644 > --- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.h > +++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.h > @@ -427,10 +427,10 @@ void intel_dpll_update_ref_clks(struct drm_i915_private *i915); > void intel_dpll_readout_hw_state(struct drm_i915_private *i915); > void intel_dpll_sanitize_state(struct drm_i915_private *i915); > > -void intel_dpll_dump_hw_state(struct drm_i915_private *i915, > +void intel_dpll_dump_hw_state(struct intel_display *display, > struct drm_printer *p, > const struct intel_dpll_hw_state *dpll_hw_state); > -bool intel_dpll_compare_hw_state(struct drm_i915_private *i915, > +bool intel_dpll_compare_hw_state(struct intel_display *display, > const struct intel_dpll_hw_state *a, > const struct intel_dpll_hw_state *b); > enum intel_dpll_id icl_tc_port_to_pll_id(enum tc_port tc_port); -- Jani Nikula, Intel