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 946C5C5475B for ; Fri, 1 Mar 2024 16:08:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E0F7E10E76D; Fri, 1 Mar 2024 16:08:38 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Seh26p7u"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2A8F810E76D for ; Fri, 1 Mar 2024 16:08:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1709309317; x=1740845317; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=9/OZEOJUxPlUcYOGh0Me8z/Kx2vgaWDEHX3HiJ1kR3Q=; b=Seh26p7uyCgjdwJUXNW+XU4OitRXOaIlkRJ9IOphHT/QtIcA4kGR5MAi bMrR7IWjlnLEHKLoj5/mpynVEupYLvbERKlbcrDMwQU8m6UKmFo6w0fBd nkVWYZ1JaB5sjlM6vdT1OkINVOD2KfDtHu+f09c/ug1wnqz4qagJjNOMB aKEY5PwzLXBa0pxNvys/BhFRsV/+yEm2is43IXUkcZTDzsq+DH6444CuY oyvb96bgh16dDwb7REaOG6oB21DVtzmZZMdDrd3vP8kVuhTjU+ZSkNFIL wHAhdllEDDs9OD+l3AmXVeTbr/8zR/hitRsXUWKmF3q8Na86pAR5OZ4PP A==; X-IronPort-AV: E=McAfee;i="6600,9927,11000"; a="15263049" X-IronPort-AV: E=Sophos;i="6.06,196,1705392000"; d="scan'208";a="15263049" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Mar 2024 08:08:36 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,196,1705392000"; d="scan'208";a="8375945" Received: from unknown (HELO intel.com) ([10.237.72.65]) by fmviesa008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Mar 2024 08:08:35 -0800 Date: Fri, 1 Mar 2024 18:08:32 +0200 From: "Lisovskiy, Stanislav" To: Ville Syrjala Cc: intel-gfx@lists.freedesktop.org Subject: Re: [PATCH 8/8] drm/i915: Handle joined pipes inside hsw_crtc_disable() Message-ID: References: <20240301143600.1334-1-ville.syrjala@linux.intel.com> <20240301143600.1334-9-ville.syrjala@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: <20240301143600.1334-9-ville.syrjala@linux.intel.com> 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" On Fri, Mar 01, 2024 at 04:36:00PM +0200, Ville Syrjala wrote: > From: Ville Syrjälä > > Reorganize the crtc disable path to only deal with the > master pipes/transcoders in intel_old_crtc_state_disables() > and offload the handling of joined pipes to hsw_crtc_disable(). > This makes the whole thing much more sensible since we can > actually control the order in which we do the per-pipe vs. > per-transcoder modeset steps. > > Signed-off-by: Ville Syrjälä > --- > drivers/gpu/drm/i915/display/intel_display.c | 64 ++++++++++++-------- > 1 file changed, 38 insertions(+), 26 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index 1df3923cc30d..07239c1ce9df 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -1793,29 +1793,27 @@ static void hsw_crtc_disable(struct intel_atomic_state *state, > const struct intel_crtc_state *old_master_crtc_state = > intel_atomic_get_old_crtc_state(state, master_crtc); > struct drm_i915_private *i915 = to_i915(master_crtc->base.dev); > + u8 pipe_mask = intel_crtc_joined_pipe_mask(old_master_crtc_state); > + struct intel_crtc *crtc; > > /* > * FIXME collapse everything to one hook. > * Need care with mst->ddi interactions. > */ > - if (!intel_crtc_is_bigjoiner_slave(old_master_crtc_state)) { > - intel_encoders_disable(state, master_crtc); > - intel_encoders_post_disable(state, master_crtc); > - } > - > - intel_disable_shared_dpll(old_master_crtc_state); > + intel_encoders_disable(state, master_crtc); > + intel_encoders_post_disable(state, master_crtc); > > - if (!intel_crtc_is_bigjoiner_slave(old_master_crtc_state)) { > - struct intel_crtc *slave_crtc; > + for_each_intel_crtc_in_pipe_mask(&i915->drm, crtc, pipe_mask) { > + const struct intel_crtc_state *old_crtc_state = > + intel_atomic_get_old_crtc_state(state, crtc); > > - intel_encoders_post_pll_disable(state, master_crtc); > + intel_disable_shared_dpll(old_crtc_state); > + } > > - intel_dmc_disable_pipe(i915, master_crtc->pipe); > + intel_encoders_post_pll_disable(state, master_crtc); > > - for_each_intel_crtc_in_pipe_mask(&i915->drm, slave_crtc, > - intel_crtc_bigjoiner_slave_pipes(old_master_crtc_state)) > - intel_dmc_disable_pipe(i915, slave_crtc->pipe); > - } > + for_each_intel_crtc_in_pipe_mask(&i915->drm, crtc, pipe_mask) > + intel_dmc_disable_pipe(i915, crtc->pipe); > } > > static void i9xx_pfit_enable(const struct intel_crtc_state *crtc_state) > @@ -6753,24 +6751,33 @@ static void intel_update_crtc(struct intel_atomic_state *state, > } > > static void intel_old_crtc_state_disables(struct intel_atomic_state *state, > - struct intel_crtc *crtc) > + struct intel_crtc *master_crtc) > { > struct drm_i915_private *dev_priv = to_i915(state->base.dev); > - const struct intel_crtc_state *new_crtc_state = > - intel_atomic_get_new_crtc_state(state, crtc); > + const struct intel_crtc_state *old_master_crtc_state = > + intel_atomic_get_old_crtc_state(state, master_crtc); > + u8 pipe_mask = intel_crtc_joined_pipe_mask(old_master_crtc_state); > + struct intel_crtc *crtc; > > /* > * We need to disable pipe CRC before disabling the pipe, > * or we race against vblank off. > */ > - intel_crtc_disable_pipe_crc(crtc); > + for_each_intel_crtc_in_pipe_mask(&dev_priv->drm, crtc, pipe_mask) > + intel_crtc_disable_pipe_crc(crtc); > > dev_priv->display.funcs.display->crtc_disable(state, crtc); > - crtc->active = false; > - intel_fbc_disable(crtc); > > - if (!new_crtc_state->hw.active) > - intel_initial_watermarks(state, crtc); > + for_each_intel_crtc_in_pipe_mask(&dev_priv->drm, crtc, pipe_mask) { > + const struct intel_crtc_state *new_crtc_state = > + intel_atomic_get_new_crtc_state(state, crtc); > + > + crtc->active = false; > + intel_fbc_disable(crtc); > + > + if (!new_crtc_state->hw.active) > + intel_initial_watermarks(state, crtc); > + } > } > > static void intel_commit_modeset_disables(struct intel_atomic_state *state) > @@ -6810,19 +6817,21 @@ static void intel_commit_modeset_disables(struct intel_atomic_state *state) > if ((disable_pipes & BIT(crtc->pipe)) == 0) > continue; > > + if (intel_crtc_is_bigjoiner_slave(old_crtc_state)) > + continue; > + > /* In case of Transcoder port Sync master slave CRTCs can be > * assigned in any order and we need to make sure that > * slave CRTCs are disabled first and then master CRTC since > * Slave vblanks are masked till Master Vblanks. > */ > if (!is_trans_port_sync_slave(old_crtc_state) && > - !intel_dp_mst_is_slave_trans(old_crtc_state) && > - !intel_crtc_is_bigjoiner_slave(old_crtc_state)) > + !intel_dp_mst_is_slave_trans(old_crtc_state)) > continue; > > intel_old_crtc_state_disables(state, crtc); > > - disable_pipes &= ~BIT(crtc->pipe); > + disable_pipes &= ~intel_crtc_joined_pipe_mask(old_crtc_state); > } > > /* Disable everything else left on */ > @@ -6830,9 +6839,12 @@ static void intel_commit_modeset_disables(struct intel_atomic_state *state) > if ((disable_pipes & BIT(crtc->pipe)) == 0) > continue; > > + if (intel_crtc_is_bigjoiner_slave(old_crtc_state)) > + continue; > + > intel_old_crtc_state_disables(state, crtc); > > - disable_pipes &= ~BIT(crtc->pipe); > + disable_pipes &= ~intel_crtc_joined_pipe_mask(old_crtc_state); Yep btw that one I've also fixed today, based on your comment, also for enable side.. Stan > } > > drm_WARN_ON(&i915->drm, disable_pipes); > -- > 2.43.0 >