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 1794EC77B73 for ; Mon, 22 May 2023 15:24:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7988310E35B; Mon, 22 May 2023 15:24:55 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id C4DB810E35B for ; Mon, 22 May 2023 15:24:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1684769092; x=1716305092; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=WVH5jgvyQ3BRI87xStpG+QDwdvTy483exya+4l9JYhg=; b=FjpolrXLDsKxQ9V0TvOy9viJBpdvBO7cI/AzNCi7CQlTdMIuX0mN0T6y 2aBckG+oGLs6Wnyrm680HLt6oFItCj1BQiJHp9dCUWy4S7J4pMaro5IPK eQfB9RpfVbwbcH8pxbtzKRvdUPAm1xqxBcm+dduqeHmFB77SuZRQNEJ5c /Lmhb/4FxRDaLulW6L2GdB8hnQnGn5bR6HqzyaYgoctMR0NPJr1S/Tqer 3oXmDkKD0FuIUkti0jc5Qeqj3XuaLpmTWv6mI2o0TEsRmLlRoeqb4ftSX CevZWnEoOWNXwGYIfmbDdQV90RyNcHvoX+hVegPE/wKBnSUd6vmVxUAei Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10718"; a="381183075" X-IronPort-AV: E=Sophos;i="6.00,184,1681196400"; d="scan'208";a="381183075" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 May 2023 08:24:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10718"; a="827743313" X-IronPort-AV: E=Sophos;i="6.00,184,1681196400"; d="scan'208";a="827743313" Received: from unknown (HELO intel.com) ([10.237.72.65]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 May 2023 08:24:46 -0700 Date: Mon, 22 May 2023 18:24:42 +0300 From: "Lisovskiy, Stanislav" To: Vinod Govindapillai Message-ID: References: <20230511231750.313467-1-vinod.govindapillai@intel.com> <20230511231750.313467-9-vinod.govindapillai@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230511231750.313467-9-vinod.govindapillai@intel.com> Subject: Re: [Intel-gfx] [PATCH v5 8/8] drm/i915/display: provision to suppress drm_warn in intel_get_crtc_new_encoder 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: , Cc: intel-gfx@lists.freedesktop.org, ville.syrjala@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Fri, May 12, 2023 at 02:17:50AM +0300, Vinod Govindapillai wrote: > While configuring pmdemand parameters, there could be > intel_get_crtc_new_encoder call where encoders could be 0. To avoid > invoking drm_warn in such cases, use a parameter to indicate drm_warn > should be suppressed. > > v2: checkpatch warning fixes I thought, last time we discussed this, wasn't it so that you mentioned that this patch will be removed?.. > > Signed-off-by: Vinod Govindapillai > --- > drivers/gpu/drm/i915/display/intel_cx0_phy.c | 2 +- > drivers/gpu/drm/i915/display/intel_display.c | 10 ++++++---- > drivers/gpu/drm/i915/display/intel_display.h | 3 ++- > drivers/gpu/drm/i915/display/intel_dpll.c | 8 ++++---- > drivers/gpu/drm/i915/display/intel_pch_display.c | 2 +- > drivers/gpu/drm/i915/display/intel_pmdemand.c | 2 +- > drivers/gpu/drm/i915/display/intel_snps_phy.c | 2 +- > 7 files changed, 16 insertions(+), 13 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_cx0_phy.c b/drivers/gpu/drm/i915/display/intel_cx0_phy.c > index d94127e7448b..1a41a314f8d8 100644 > --- a/drivers/gpu/drm/i915/display/intel_cx0_phy.c > +++ b/drivers/gpu/drm/i915/display/intel_cx0_phy.c > @@ -2934,7 +2934,7 @@ void intel_c10pll_state_verify(struct intel_atomic_state *state, > !intel_crtc_needs_fastset(new_crtc_state)) > return; > > - encoder = intel_get_crtc_new_encoder(state, new_crtc_state); > + encoder = intel_get_crtc_new_encoder(state, new_crtc_state, true); > phy = intel_port_to_phy(i915, encoder->port); > > if (!intel_is_c10phy(i915, phy)) > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index dd390a0586ef..fb2b77aaaa69 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -763,7 +763,8 @@ bool intel_has_pending_fb_unpin(struct drm_i915_private *dev_priv) > */ > struct intel_encoder * > intel_get_crtc_new_encoder(const struct intel_atomic_state *state, > - const struct intel_crtc_state *crtc_state) > + const struct intel_crtc_state *crtc_state, > + bool warn) > { > const struct drm_connector_state *connector_state; > const struct drm_connector *connector; > @@ -782,9 +783,10 @@ intel_get_crtc_new_encoder(const struct intel_atomic_state *state, > num_encoders++; > } > > - drm_WARN(state->base.dev, num_encoders != 1, > - "%d encoders for pipe %c\n", > - num_encoders, pipe_name(master_crtc->pipe)); > + if (warn) > + drm_WARN(state->base.dev, num_encoders != 1, > + "%d encoders for pipe %c\n", > + num_encoders, pipe_name(master_crtc->pipe)); > > return encoder; > } > diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h > index ac95961f68ba..4620ed991ff0 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.h > +++ b/drivers/gpu/drm/i915/display/intel_display.h > @@ -501,7 +501,8 @@ bool intel_plane_uses_fence(const struct intel_plane_state *plane_state); > > struct intel_encoder * > intel_get_crtc_new_encoder(const struct intel_atomic_state *state, > - const struct intel_crtc_state *crtc_state); > + const struct intel_crtc_state *crtc_state, > + bool warn); > void intel_plane_disable_noatomic(struct intel_crtc *crtc, > struct intel_plane *plane); > void intel_set_plane_visible(struct intel_crtc_state *crtc_state, > diff --git a/drivers/gpu/drm/i915/display/intel_dpll.c b/drivers/gpu/drm/i915/display/intel_dpll.c > index ca0f362a40e3..3101de274f9d 100644 > --- a/drivers/gpu/drm/i915/display/intel_dpll.c > +++ b/drivers/gpu/drm/i915/display/intel_dpll.c > @@ -940,7 +940,7 @@ static int hsw_crtc_compute_clock(struct intel_atomic_state *state, > struct intel_crtc_state *crtc_state = > intel_atomic_get_new_crtc_state(state, crtc); > struct intel_encoder *encoder = > - intel_get_crtc_new_encoder(state, crtc_state); > + intel_get_crtc_new_encoder(state, crtc_state, true); > int ret; > > if (DISPLAY_VER(dev_priv) < 11 && > @@ -969,7 +969,7 @@ static int hsw_crtc_get_shared_dpll(struct intel_atomic_state *state, > struct intel_crtc_state *crtc_state = > intel_atomic_get_new_crtc_state(state, crtc); > struct intel_encoder *encoder = > - intel_get_crtc_new_encoder(state, crtc_state); > + intel_get_crtc_new_encoder(state, crtc_state, true); > > if (DISPLAY_VER(dev_priv) < 11 && > intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DSI)) > @@ -984,7 +984,7 @@ static int dg2_crtc_compute_clock(struct intel_atomic_state *state, > struct intel_crtc_state *crtc_state = > intel_atomic_get_new_crtc_state(state, crtc); > struct intel_encoder *encoder = > - intel_get_crtc_new_encoder(state, crtc_state); > + intel_get_crtc_new_encoder(state, crtc_state, true); > int ret; > > ret = intel_mpllb_calc_state(crtc_state, encoder); > @@ -1003,7 +1003,7 @@ static int mtl_crtc_compute_clock(struct intel_atomic_state *state, > struct intel_crtc_state *crtc_state = > intel_atomic_get_new_crtc_state(state, crtc); > struct intel_encoder *encoder = > - intel_get_crtc_new_encoder(state, crtc_state); > + intel_get_crtc_new_encoder(state, crtc_state, true); > enum phy phy = intel_port_to_phy(i915, encoder->port); > int ret; > > diff --git a/drivers/gpu/drm/i915/display/intel_pch_display.c b/drivers/gpu/drm/i915/display/intel_pch_display.c > index 2411fe4dee8b..fa91a9f66422 100644 > --- a/drivers/gpu/drm/i915/display/intel_pch_display.c > +++ b/drivers/gpu/drm/i915/display/intel_pch_display.c > @@ -427,7 +427,7 @@ void ilk_pch_enable(struct intel_atomic_state *state, > if (adjusted_mode->flags & DRM_MODE_FLAG_PVSYNC) > temp |= TRANS_DP_VSYNC_ACTIVE_HIGH; > > - port = intel_get_crtc_new_encoder(state, crtc_state)->port; > + port = intel_get_crtc_new_encoder(state, crtc_state, true)->port; > drm_WARN_ON(&dev_priv->drm, port < PORT_B || port > PORT_D); > temp |= TRANS_DP_PORT_SEL(port); > > diff --git a/drivers/gpu/drm/i915/display/intel_pmdemand.c b/drivers/gpu/drm/i915/display/intel_pmdemand.c > index ea117189910f..b9821f8b0700 100644 > --- a/drivers/gpu/drm/i915/display/intel_pmdemand.c > +++ b/drivers/gpu/drm/i915/display/intel_pmdemand.c > @@ -224,7 +224,7 @@ int intel_pmdemand_atomic_check(struct intel_atomic_state *state) > if (!new_crtc_state->hw.active) > continue; > > - encoder = intel_get_crtc_new_encoder(state, new_crtc_state); > + encoder = intel_get_crtc_new_encoder(state, new_crtc_state, false); > if (!encoder) > continue; > > diff --git a/drivers/gpu/drm/i915/display/intel_snps_phy.c b/drivers/gpu/drm/i915/display/intel_snps_phy.c > index a72677bf617b..a4d56a2a670a 100644 > --- a/drivers/gpu/drm/i915/display/intel_snps_phy.c > +++ b/drivers/gpu/drm/i915/display/intel_snps_phy.c > @@ -2012,7 +2012,7 @@ void intel_mpllb_state_verify(struct intel_atomic_state *state, > !intel_crtc_needs_fastset(new_crtc_state)) > return; > > - encoder = intel_get_crtc_new_encoder(state, new_crtc_state); > + encoder = intel_get_crtc_new_encoder(state, new_crtc_state, true); > intel_mpllb_readout_hw_state(encoder, &mpllb_hw_state); > > #define MPLLB_CHECK(__name) \ > -- > 2.34.1 >