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, URIBL_BLOCKED,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 454DEC54E8B for ; Tue, 12 May 2020 13:14:38 +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 2570B206DD for ; Tue, 12 May 2020 13:14:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2570B206DD 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 CE3EB6E914; Tue, 12 May 2020 13:14:37 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9ED646E914 for ; Tue, 12 May 2020 13:14:36 +0000 (UTC) IronPort-SDR: bDEiZOwMY9rtG7W+R2qSpVR9ozViqjs2RYgQhqGap/3GHnn6Y+7JCzszvKHuQ/HVGFYXfpxM8z lYXrHh6jeumg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 May 2020 06:14:36 -0700 IronPort-SDR: /fPRm2DNWyWHyXGhJHYBep8XtLUiu5seT8MlVtmrE4eDtdhMH9ycZpJs1OpAinhBwsHjbDs6/q MloS5SP1OFnQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,383,1583222400"; d="scan'208";a="252890517" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by fmsmga008.fm.intel.com with SMTP; 12 May 2020 06:14:33 -0700 Received: by stinkbox (sSMTP sendmail emulation); Tue, 12 May 2020 16:14:33 +0300 Date: Tue, 12 May 2020 16:14:33 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: "Lisovskiy, Stanislav" Message-ID: <20200512131433.GR6112@intel.com> References: <20200507144503.15506-1-stanislav.lisovskiy@intel.com> <20200507144503.15506-4-stanislav.lisovskiy@intel.com> <20200512113925.GM6112@intel.com> <20200512124406.GA19632@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200512124406.GA19632@intel.com> X-Patchwork-Hint: comment User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [Intel-gfx] [PATCH v28 3/6] drm/i915: Make active_pipes check skl specific 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 12, 2020 at 03:44:06PM +0300, Lisovskiy, Stanislav wrote: > On Tue, May 12, 2020 at 02:39:25PM +0300, Ville Syrj=E4l=E4 wrote: > > On Thu, May 07, 2020 at 05:45:00PM +0300, Stanislav Lisovskiy wrote: > > > Seems that only skl needs to have SAGV turned off > > > for multipipe scenarios, so lets do it this way. > > = > > It doesn't afaics. It's just someone added the check for some random > > reason. So this should be reworded a bit. Also this isn't just about > > skl/derivatives but all pre-icl so the is a bit misleading to= o. > = > This is in BSpec anyway. And it was in the code before, so I really = > don't get what do you mean here. > = > > = > > > = > > > If anything blows up - we can always revert this patch. > > > = > > > Signed-off-by: Stanislav Lisovskiy > > > --- > > > drivers/gpu/drm/i915/intel_pm.c | 15 +++++++++------ > > > drivers/gpu/drm/i915/intel_pm.h | 3 ++- > > > 2 files changed, 11 insertions(+), 7 deletions(-) > > > = > > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/i= ntel_pm.c > > > index 3dc1ad66beb3..db188efee21e 100644 > > > --- a/drivers/gpu/drm/i915/intel_pm.c > > > +++ b/drivers/gpu/drm/i915/intel_pm.c > > > @@ -3777,7 +3777,7 @@ void intel_sagv_pre_plane_update(struct intel_a= tomic_state *state) > > > if (!new_bw_state) > > > return; > > > = > > > - if (!intel_can_enable_sagv(new_bw_state)) > > > + if (!intel_can_enable_sagv(dev_priv, new_bw_state)) > > > intel_disable_sagv(dev_priv); > > > } > > > = > > > @@ -3800,7 +3800,7 @@ void intel_sagv_post_plane_update(struct intel_= atomic_state *state) > > > if (!new_bw_state) > > > return; > > > = > > > - if (intel_can_enable_sagv(new_bw_state)) > > > + if (intel_can_enable_sagv(dev_priv, new_bw_state)) > > > intel_enable_sagv(dev_priv); > > > } > > > = > > > @@ -3853,16 +3853,19 @@ static bool skl_crtc_can_enable_sagv(const st= ruct intel_crtc_state *crtc_state) > > > return true; > > > } > > > = > > > -bool intel_can_enable_sagv(const struct intel_bw_state *bw_state) > > > +bool intel_can_enable_sagv(struct drm_i915_private *dev_priv, > > > + const struct intel_bw_state *bw_state) > > > { > > > - if (bw_state->active_pipes && !is_power_of_2(bw_state->active_pipes= )) > > > - return false; > > > + if (INTEL_GEN(dev_priv) < 11) > > > + if (bw_state->active_pipes && !is_power_of_2(bw_state->active_pipe= s)) > > = > > If (a && b && c) > > return false; > = > Then the line would get too long, and it does exactly same thing. > I really don't understand such comments. if (a && b && c) if (a && b && c) if (a && b && c) there are plenty of options. The point is nested ifs like this only serve to indent code needlessly deep. > = > Stan > = > > = > > = > > > + return false; > > > = > > > return bw_state->pipe_sagv_reject =3D=3D 0; > > > } > > > = > > > 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; > > > const struct intel_crtc_state *new_crtc_state; > > > @@ -3896,7 +3899,7 @@ static int intel_compute_sagv_mask(struct intel= _atomic_state *state) > > > return ret; > > > } > > > = > > > - if (intel_can_enable_sagv(new_bw_state) !=3D intel_can_enable_sagv(= old_bw_state)) { > > > + if (intel_can_enable_sagv(dev_priv, new_bw_state) !=3D intel_can_en= able_sagv(dev_priv, old_bw_state)) { > > = > > > ret =3D intel_atomic_serialize_global_state(&new_bw_state->base); > > > if (ret) > > > return ret; > > > diff --git a/drivers/gpu/drm/i915/intel_pm.h b/drivers/gpu/drm/i915/i= ntel_pm.h > > > index fd1dc422e6c5..614ac7f8d4cc 100644 > > > --- a/drivers/gpu/drm/i915/intel_pm.h > > > +++ b/drivers/gpu/drm/i915/intel_pm.h > > > @@ -42,7 +42,8 @@ void skl_pipe_wm_get_hw_state(struct intel_crtc *cr= tc, > > > struct skl_pipe_wm *out); > > > void g4x_wm_sanitize(struct drm_i915_private *dev_priv); > > > void vlv_wm_sanitize(struct drm_i915_private *dev_priv); > > > -bool intel_can_enable_sagv(const struct intel_bw_state *bw_state); > > > +bool intel_can_enable_sagv(struct drm_i915_private *dev_priv, > > > + const struct intel_bw_state *bw_state); > > > int intel_enable_sagv(struct drm_i915_private *dev_priv); > > > int intel_disable_sagv(struct drm_i915_private *dev_priv); > > > void intel_sagv_pre_plane_update(struct intel_atomic_state *state); > > > -- = > > > 2.24.1.485.gad05a3d8e5 > > = > > -- = > > Ville Syrj=E4l=E4 > > Intel -- = Ville Syrj=E4l=E4 Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx