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 E2059D43358 for ; Thu, 7 Nov 2024 12:22:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AB8F610E812; Thu, 7 Nov 2024 12:22:04 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="nATXQYKD"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6332310E30C; Thu, 7 Nov 2024 12:22:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1730982123; x=1762518123; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=nO3SocA98paN5KPgNbL+IrkX/PVCG7HlOkGs8KtZJt4=; b=nATXQYKDNeMh4t/R2Q3vyetCexn11u7kDvThfWyWmm1/nH8/aJqwIeRY t2WsvKkDpXAtlh/eNoIjcyL7+Letik828iwgoLEX3OLLVraboPgjdxv7G ngztg4joAHfUjgcaXIId4i3AjIjl24NJtXWSqxcq0Hlb8hq7YjrPARLf/ oSnZNAg7aN46ZXsLrJJUUf8DZOp5oKnaRDGyYgerPPqIEDOufyeysWUei s1tlOiyBVLYnqfreU6zLbRO2Agecl8p0us3QZpI/3GbgL9SHjhPTjcnXU u1IDsuhVMxVTG3TSw2nHaTXBGVWm7+xcIp7XMJc4b0sJQhENcdAG1ROuR Q==; X-CSE-ConnectionGUID: eckEgLrkTMGm4fKZaaNb4A== X-CSE-MsgGUID: ajNQyUdcS/KjijlfOBUzUQ== X-IronPort-AV: E=McAfee;i="6700,10204,11222"; a="34515416" X-IronPort-AV: E=Sophos;i="6.11,199,1725346800"; d="scan'208";a="34515416" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Nov 2024 04:22:03 -0800 X-CSE-ConnectionGUID: AbV0EBFeSVG/BHTk9iz5kw== X-CSE-MsgGUID: /bS2FtFzS2ujq96YuQoNiw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,265,1728975600"; d="scan'208";a="85188051" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by fmviesa008.fm.intel.com with SMTP; 07 Nov 2024 04:22:00 -0800 Received: by stinkbox (sSMTP sendmail emulation); Thu, 07 Nov 2024 14:21:59 +0200 Date: Thu, 7 Nov 2024 14:21:59 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Maarten Lankhorst Cc: intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, Maarten@mblankhorst.nl, Lankhorst@mblankhorst.nl, dev@lankhorst.se Subject: Re: [PATCH] drm/xe/display: Add intel_plane_initial_vblank_wait Message-ID: References: <20241107100140.292928-2-maarten.lankhorst@linux.intel.com> <20241107113617.349916-1-maarten.lankhorst@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20241107113617.349916-1-maarten.lankhorst@linux.intel.com> X-Patchwork-Hint: comment 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 Thu, Nov 07, 2024 at 12:36:17PM +0100, Maarten Lankhorst wrote: > We're changing the driver to have no interrupts during early init for > Xe, so we poll the PIPE_FRMSTMSMP counter instead. > > Signed-off-by: Maarten Lankhorst > Link: https://patchwork.freedesktop.org/patch/msgid/20241105121857.17389-2-maarten.lankhorst@linux.intel.com > Signed-off-by: Maarten Lankhorst,,, > --- > drivers/gpu/drm/i915/display/intel_display.c | 6 +++--- > .../drm/i915/display/intel_plane_initial.c | 9 ++++++++- > .../drm/i915/display/intel_plane_initial.h | 2 ++ > drivers/gpu/drm/xe/display/xe_plane_initial.c | 19 ++++++++++++++++++- > 4 files changed, 31 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index d7f92dc56d1e9..7bd6da2bb36f7 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -795,7 +795,7 @@ void intel_plane_disable_noatomic(struct intel_crtc *crtc, > if ((crtc_state->active_planes & ~BIT(PLANE_CURSOR)) == 0 && > hsw_ips_disable(crtc_state)) { > crtc_state->ips_enabled = false; > - intel_crtc_wait_for_next_vblank(crtc); > + intel_plane_initial_vblank_wait(plane); > } > > /* > @@ -809,7 +809,7 @@ void intel_plane_disable_noatomic(struct intel_crtc *crtc, > */ > if (HAS_GMCH(dev_priv) && > intel_set_memory_cxsr(dev_priv, false)) > - intel_crtc_wait_for_next_vblank(crtc); > + intel_plane_initial_vblank_wait(plane); > > /* > * Gen2 reports pipe underruns whenever all planes are disabled. > @@ -819,7 +819,7 @@ void intel_plane_disable_noatomic(struct intel_crtc *crtc, > intel_set_cpu_fifo_underrun_reporting(dev_priv, crtc->pipe, false); > > intel_plane_disable_arm(NULL, plane, crtc_state); > - intel_crtc_wait_for_next_vblank(crtc); > + intel_plane_initial_vblank_wait(plane); > } > > unsigned int > diff --git a/drivers/gpu/drm/i915/display/intel_plane_initial.c b/drivers/gpu/drm/i915/display/intel_plane_initial.c > index 62401f6a04e4f..77eb2b763be5e 100644 > --- a/drivers/gpu/drm/i915/display/intel_plane_initial.c > +++ b/drivers/gpu/drm/i915/display/intel_plane_initial.c > @@ -14,6 +14,13 @@ > #include "intel_frontbuffer.h" > #include "intel_plane_initial.h" > > +void intel_plane_initial_vblank_wait(struct intel_plane *plane) > +{ > + struct intel_crtc *crtc = intel_crtc_for_pipe(to_intel_display(plane->base.dev), plane->pipe); > + > + intel_crtc_wait_for_next_vblank(crtc); > +} > + > static bool > intel_reuse_initial_plane_obj(struct intel_crtc *this, > const struct intel_initial_plane_config plane_configs[], > @@ -438,7 +445,7 @@ void intel_initial_plane_config(struct drm_i915_private *i915) > intel_find_initial_plane_obj(crtc, plane_configs); > > if (i915->display.funcs.display->fixup_initial_plane_config(crtc, plane_config)) > - intel_crtc_wait_for_next_vblank(crtc); > + intel_plane_initial_vblank_wait(to_intel_plane(crtc->base.primary)); > > plane_config_fini(plane_config); > } > diff --git a/drivers/gpu/drm/i915/display/intel_plane_initial.h b/drivers/gpu/drm/i915/display/intel_plane_initial.h > index 64ab95239cd45..149b1bf1bc1f8 100644 > --- a/drivers/gpu/drm/i915/display/intel_plane_initial.h > +++ b/drivers/gpu/drm/i915/display/intel_plane_initial.h > @@ -7,7 +7,9 @@ > #define __INTEL_PLANE_INITIAL_H__ > > struct drm_i915_private; > +struct intel_plane; > > +void intel_plane_initial_vblank_wait(struct intel_plane *plane); > void intel_initial_plane_config(struct drm_i915_private *i915); > > #endif > diff --git a/drivers/gpu/drm/xe/display/xe_plane_initial.c b/drivers/gpu/drm/xe/display/xe_plane_initial.c > index 668f544a7ac80..9252cfeef0a1f 100644 > --- a/drivers/gpu/drm/xe/display/xe_plane_initial.c > +++ b/drivers/gpu/drm/xe/display/xe_plane_initial.c > @@ -8,7 +8,9 @@ > > #include "regs/xe_gtt_defs.h" > #include "xe_ggtt.h" > +#include "xe_mmio.h" > > +#include "i915_reg.h" > #include "intel_atomic_plane.h" > #include "intel_crtc.h" > #include "intel_display.h" > @@ -22,6 +24,21 @@ > > #include > > +void intel_plane_initial_vblank_wait(struct intel_plane *plane) > +{ > + /* Early xe has no irq */ > + struct xe_device *xe = to_xe_device(plane->base.dev); > + struct xe_reg pipe_frmtmstmp = XE_REG(i915_mmio_reg_offset(PIPE_FRMTMSTMP(plane->pipe))); > + u32 timestamp; > + int ret; > + > + timestamp = xe_mmio_read32(xe_root_tile_mmio(xe), pipe_frmtmstmp); > + > + ret = xe_mmio_wait32_not(xe_root_tile_mmio(xe), pipe_frmtmstmp, ~0U, timestamp, 40000U, ×tamp, false); > + if (ret < 0) > + drm_warn(&xe->drm, "waiting for early vblank failed with %i\n", ret); Why did you change to this from the earlier SURFLIVE approach? > +} > + > static bool > intel_reuse_initial_plane_obj(struct intel_crtc *this, > const struct intel_initial_plane_config plane_configs[], > @@ -293,7 +310,7 @@ void intel_initial_plane_config(struct drm_i915_private *i915) > intel_find_initial_plane_obj(crtc, plane_configs); > > if (i915->display.funcs.display->fixup_initial_plane_config(crtc, plane_config)) > - intel_crtc_wait_for_next_vblank(crtc); > + intel_plane_initial_vblank_wait(to_intel_plane(crtc->base.primary)); > > plane_config_fini(plane_config); > } > -- > 2.45.2 -- Ville Syrjälä Intel