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.3 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 B97C1C4BA13 for ; Wed, 26 Feb 2020 17:27:33 +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 93392222C2 for ; Wed, 26 Feb 2020 17:27:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 93392222C2 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 26A5F6EB35; Wed, 26 Feb 2020 17:27:33 +0000 (UTC) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 97B9E6EB4D for ; Wed, 26 Feb 2020 17:27:32 +0000 (UTC) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Feb 2020 09:27:31 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,488,1574150400"; d="scan'208";a="230504655" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by fmsmga007.fm.intel.com with SMTP; 26 Feb 2020 09:27:29 -0800 Received: by stinkbox (sSMTP sendmail emulation); Wed, 26 Feb 2020 19:27:28 +0200 Date: Wed, 26 Feb 2020 19:27:28 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Anshuman Gupta Message-ID: <20200226172728.GM13686@intel.com> References: <20200224124004.26712-1-anshuman.gupta@intel.com> <20200224124004.26712-5-anshuman.gupta@intel.com> <20200225150639.GD13686@intel.com> <20200226150943.GL13686@intel.com> <20200226152407.GA18198@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200226152407.GA18198@intel.com> X-Patchwork-Hint: comment User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [Intel-gfx] [PATCH v3 4/7] drm/i915: Fix wrongly populated plane possible_crtcs bit mask 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: jani.nikula@intel.com, 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 Wed, Feb 26, 2020 at 08:54:08PM +0530, Anshuman Gupta wrote: > On 2020-02-26 at 17:09:43 +0200, Ville Syrj=E4l=E4 wrote: > > On Tue, Feb 25, 2020 at 05:06:39PM +0200, Ville Syrj=E4l=E4 wrote: > > > On Mon, Feb 24, 2020 at 06:10:01PM +0530, Anshuman Gupta wrote: > > > > As a disabled pipe in pipe_mask is not having a valid intel crtc, > > > > driver wrongly populates the possible_crtcs mask while initializing > > > > the plane for a CRTC. Fixing up the plane possible_crtcs mask. > > > > = > > > > changes since RFC: > > > > - Simplify the possible_crtcs initialization. [Ville] > > > > v2: > > > > - Removed the unnecessary stack garbage possible_crtcs to > > > > drm_universal_plane_init. [Ville] > > > > v3: > > > > - Combine the intel_crtc assignment and declaration. [Ville] > > > > = > > > > Cc: Ville Syrj=E4l=E4 > > > > Reviewed-by: Ville Syrj=E4l=E4 > > > > Signed-off-by: Anshuman Gupta > > > > --- > > > > drivers/gpu/drm/i915/display/intel_display.c | 13 +++++++++++++ > > > > drivers/gpu/drm/i915/display/intel_sprite.c | 5 +---- > > > > 2 files changed, 14 insertions(+), 4 deletions(-) > > > > = > > > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers= /gpu/drm/i915/display/intel_display.c > > > > index aacbdc47fcea..41a0f2e9b6b9 100644 > > > > --- a/drivers/gpu/drm/i915/display/intel_display.c > > > > +++ b/drivers/gpu/drm/i915/display/intel_display.c > > > > @@ -16628,6 +16628,18 @@ static void intel_crtc_free(struct intel_c= rtc *crtc) > > > > kfree(crtc); > > > > } > > > > = > > > > +static void intel_plane_possible_crtcs_init(struct drm_i915_privat= e *dev_priv) > > > > +{ > > > > + struct intel_plane *plane; > > > > + > > > > + for_each_intel_plane(&dev_priv->drm, plane) { > > > > + struct intel_crtc *crtc =3D intel_get_crtc_for_pipe(dev_priv, > > > > + plane->pipe); > > > > + > > > > + plane->base.possible_crtcs =3D drm_crtc_mask(&crtc->base); > > > > + } > > > > +} > > > > + > > > > static int intel_crtc_init(struct drm_i915_private *dev_priv, enum= pipe pipe) > > > > { > > > > struct intel_plane *primary, *cursor; > > > > @@ -17843,6 +17855,7 @@ int intel_modeset_init(struct drm_i915_priv= ate *i915) > > > > } > > > > } > > > > = > > > > + intel_plane_possible_crtcs_init(i915); > > > > intel_shared_dpll_init(dev); > > > > intel_update_fdi_pll_freq(i915); > > > > = > > > > diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/= gpu/drm/i915/display/intel_sprite.c > > > > index 7abeefe8dce5..b5c7b271a1a4 100644 > > > > --- a/drivers/gpu/drm/i915/display/intel_sprite.c > > > > +++ b/drivers/gpu/drm/i915/display/intel_sprite.c > > > > @@ -3011,7 +3011,6 @@ skl_universal_plane_create(struct drm_i915_pr= ivate *dev_priv, > > > > struct intel_plane *plane; > > > > enum drm_plane_type plane_type; > > > > unsigned int supported_rotations; > > > > - unsigned int possible_crtcs; > > > > const u64 *modifiers; > > > > const u32 *formats; > > > > int num_formats; > > > > @@ -3066,10 +3065,8 @@ skl_universal_plane_create(struct drm_i915_p= rivate *dev_priv, > > > > else > > > > plane_type =3D DRM_PLANE_TYPE_OVERLAY; > > > > = > > > > - possible_crtcs =3D BIT(pipe); > > > > - > > > > ret =3D drm_universal_plane_init(&dev_priv->drm, &plane->base, > > > > - possible_crtcs, plane_funcs, > > > > + 0, plane_funcs, > > > > formats, num_formats, modifiers, > > > > plane_type, > > > > "plane %d%c", plane_id + 1, > > > = > > > Looks like you missed all the other places that do this: > > > intel_primary_plane_create(), intel_sprite_plane_create(), > > > intel_cursor_plane_create(). > Yes i missed intel_cursor_plane_create(), but other two sprite and > primary using the skl_universal_plane_create() for gen > gen9 and > having early return, considering that i have modiefied only = > skl_universal_plane_create() and overlooked intel_cursor_plane_create(). > Shall i fix this for all *plane_create() or just for cursor? Just change all of them. We don't want to accumulate pointless differences between the platforms. -- = Ville Syrj=E4l=E4 Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx