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 X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE754C47254 for ; Tue, 5 May 2020 10:42:51 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id B726E206A5 for ; Tue, 5 May 2020 10:42:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B726E206A5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 510316E199; Tue, 5 May 2020 10:42:51 +0000 (UTC) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0C3D36E199 for ; Tue, 5 May 2020 10:42:49 +0000 (UTC) IronPort-SDR: IvtJEna1w8Ti8NuEZokedKF5olj4a/A7Qu2s/xyN0W7Nb6NrLhDNvjF5pidghd255wODXBDcj/ Air1Rzok4k8A== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 May 2020 03:42:49 -0700 IronPort-SDR: CBPnm/kKrsWBktKbtjqAi5QAIqnb81+uM1UJQkoTUvXQTpSUE7AaFWS1Ye2tkYr5m8aNy5CUMG dW2VNcuXXQjA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,354,1583222400"; d="scan'208";a="277833166" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by orsmga002.jf.intel.com with SMTP; 05 May 2020 03:42:47 -0700 Received: by stinkbox (sSMTP sendmail emulation); Tue, 05 May 2020 13:42:46 +0300 Date: Tue, 5 May 2020 13:42:46 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Stanislav Lisovskiy Message-ID: <20200505104246.GF6112@intel.com> References: <20200505102247.32452-1-stanislav.lisovskiy@intel.com> <20200505102247.32452-3-stanislav.lisovskiy@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200505102247.32452-3-stanislav.lisovskiy@intel.com> X-Patchwork-Hint: comment User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [Intel-gfx] [PATCH v27 2/6] drm/i915: Separate icl and skl SAGV checking 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 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Tue, May 05, 2020 at 01:22:43PM +0300, Stanislav Lisovskiy wrote: > Introduce platform dependent SAGV checking in > combination with bandwidth state pipe SAGV mask. > = > v2, v3, v4, v5, v6: Fix rebase conflict > = > Signed-off-by: Stanislav Lisovskiy > --- > drivers/gpu/drm/i915/intel_pm.c | 30 ++++++++++++++++++++++++++++-- > 1 file changed, 28 insertions(+), 2 deletions(-) > = > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel= _pm.c > index da567fac7c93..c7d726a656b2 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -3853,6 +3853,24 @@ static bool intel_crtc_can_enable_sagv(const struc= t intel_crtc_state *crtc_state > return true; > } > = > +static bool skl_crtc_can_enable_sagv(const struct intel_crtc_state *crtc= _state) > +{ > + struct intel_atomic_state *state =3D to_intel_atomic_state(crtc_state->= uapi.state); > + /* > + * SKL+ workaround: bspec recommends we disable SAGV when we have > + * more then one pipe enabled > + */ > + if (hweight8(state->active_pipes) > 1) > + return false; That stuff should no longer be here since we now have it done properly in intel_can_eanble_sagv(). > + > + return intel_crtc_can_enable_sagv(crtc_state); > +} > + > +static bool icl_crtc_can_enable_sagv(const struct intel_crtc_state *crtc= _state) > +{ > + return intel_crtc_can_enable_sagv(crtc_state); > +} This looks the wrong way around. IMO intel_crtc_can_enable_sagv() should rather call the skl vs. icl variants as needed. Although we don't yet have the icl variant so the oerdering of the patches is a bit weird. > + > bool intel_can_enable_sagv(const struct intel_bw_state *bw_state) > { > if (bw_state->active_pipes && !is_power_of_2(bw_state->active_pipes)) > @@ -3863,22 +3881,30 @@ bool intel_can_enable_sagv(const struct intel_bw_= state *bw_state) > = > static int intel_compute_sagv_mask(struct intel_atomic_state *state) > { > + struct drm_i915_private *dev_priv =3D to_i915(state->base.dev); > int ret; > struct intel_crtc *crtc; > - struct intel_crtc_state *new_crtc_state; > + const struct intel_crtc_state *new_crtc_state; > struct intel_bw_state *new_bw_state =3D NULL; > const struct intel_bw_state *old_bw_state =3D NULL; > int i; > = > for_each_new_intel_crtc_in_state(state, crtc, > new_crtc_state, i) { > + bool can_sagv; > + > new_bw_state =3D intel_atomic_get_bw_state(state); > if (IS_ERR(new_bw_state)) > return PTR_ERR(new_bw_state); > = > old_bw_state =3D intel_atomic_get_old_bw_state(state); > = > - if (intel_crtc_can_enable_sagv(new_crtc_state)) > + if (INTEL_GEN(dev_priv) >=3D 11) > + can_sagv =3D icl_crtc_can_enable_sagv(new_crtc_state); > + else > + can_sagv =3D skl_crtc_can_enable_sagv(new_crtc_state); > + > + if (can_sagv) > new_bw_state->pipe_sagv_reject &=3D ~BIT(crtc->pipe); > else > new_bw_state->pipe_sagv_reject |=3D BIT(crtc->pipe); > -- = > 2.24.1.485.gad05a3d8e5 -- = Ville Syrj=E4l=E4 Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx