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 296A9C2BA83 for ; Fri, 7 Feb 2020 16:49:09 +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 051A321741 for ; Fri, 7 Feb 2020 16:49:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 051A321741 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=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7E1EB6EAD2; Fri, 7 Feb 2020 16:49:08 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5E7956EAD2; Fri, 7 Feb 2020 16:49:07 +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 fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Feb 2020 08:49:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,414,1574150400"; d="scan'208";a="225595113" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by fmsmga007.fm.intel.com with SMTP; 07 Feb 2020 08:49:04 -0800 Received: by stinkbox (sSMTP sendmail emulation); Fri, 07 Feb 2020 18:49:03 +0200 Date: Fri, 7 Feb 2020 18:49:03 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Daniel Vetter Subject: Re: [PATCH v2 6/6] drm: Validate encoder->possible_crtcs Message-ID: <20200207164903.GO13686@intel.com> References: <20200207135950.6655-1-ville.syrjala@linux.intel.com> <20200207135950.6655-7-ville.syrjala@linux.intel.com> <20200207163926.GN43062@phenom.ffwll.local> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200207163926.GN43062@phenom.ffwll.local> X-Patchwork-Hint: comment User-Agent: Mutt/1.10.1 (2018-07-13) X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org, Thomas Zimmermann , dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Fri, Feb 07, 2020 at 05:39:26PM +0100, Daniel Vetter wrote: > On Fri, Feb 07, 2020 at 03:59:50PM +0200, Ville Syrjala wrote: > > From: Ville Syrj=E4l=E4 > > = > > WARN if the encoder possible_crtcs is effectively empty or contains > > bits for non-existing crtcs. > > = > > TODO: Or should we perhapst just filter out any bit for a > > non-exisiting crtc? > > = > > Cc: Thomas Zimmermann > > Cc: Daniel Vetter > > Signed-off-by: Ville Syrj=E4l=E4 > = > >From a quick grep it looks like at least most drivers seem to get this > right. Worth a shot to find the hold-outs. > = > Two things: > - Imo also best to move into the drm_mode_config_validate I suggested. > - Please update the kerneldoc for drm_encoder.possible_crtcs to mention > that this will WARN if you get it wrong (and maybe remove the line that > most drivers screw this up). ack > = > Check itself lgtm. > -Daniel > = > > --- > > drivers/gpu/drm/drm_encoder.c | 18 ++++++++++++++++++ > > 1 file changed, 18 insertions(+) > > = > > diff --git a/drivers/gpu/drm/drm_encoder.c b/drivers/gpu/drm/drm_encode= r.c > > index bc2246f27e0d..f16b2a2518d7 100644 > > --- a/drivers/gpu/drm/drm_encoder.c > > +++ b/drivers/gpu/drm/drm_encoder.c > > @@ -107,6 +107,23 @@ static void validate_possible_clones(struct drm_en= coder *encoder) > > encoder->possible_clones, encoder_mask); > > } > > = > > +static void validate_possible_crtcs(struct drm_encoder *encoder) > > +{ > > + struct drm_device *dev =3D encoder->dev; > > + struct drm_crtc *crtc; > > + u32 crtc_mask =3D 0; > > + > > + drm_for_each_crtc(crtc, dev) > > + crtc_mask |=3D drm_crtc_mask(crtc); > > + > > + WARN((encoder->possible_crtcs & crtc_mask) =3D=3D 0 || > > + (encoder->possible_crtcs & ~crtc_mask) !=3D 0, > > + "Bogus possible_crtcs: " > > + "[ENCODER:%d:%s] possible_crtcs=3D0x%x (full crtc mask=3D0x%x)\n= ", > > + encoder->base.id, encoder->name, > > + encoder->possible_crtcs, crtc_mask); > > +} > > + > > int drm_encoder_register_all(struct drm_device *dev) > > { > > struct drm_encoder *encoder; > > @@ -115,6 +132,7 @@ int drm_encoder_register_all(struct drm_device *dev) > > fixup_possible_clones(dev); > > = > > drm_for_each_encoder(encoder, dev) { > > + validate_possible_crtcs(encoder); > > validate_possible_clones(encoder); > > = > > if (encoder->funcs->late_register) > > -- = > > 2.24.1 > > = > = > -- = > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch -- = Ville Syrj=E4l=E4 Intel _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel 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=unavailable 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 B4110C2BA83 for ; Fri, 7 Feb 2020 16:49:12 +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 923F521741 for ; Fri, 7 Feb 2020 16:49:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 923F521741 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 C104A6EAD4; Fri, 7 Feb 2020 16:49:08 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5E7956EAD2; Fri, 7 Feb 2020 16:49:07 +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 fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Feb 2020 08:49:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,414,1574150400"; d="scan'208";a="225595113" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by fmsmga007.fm.intel.com with SMTP; 07 Feb 2020 08:49:04 -0800 Received: by stinkbox (sSMTP sendmail emulation); Fri, 07 Feb 2020 18:49:03 +0200 Date: Fri, 7 Feb 2020 18:49:03 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Daniel Vetter Message-ID: <20200207164903.GO13686@intel.com> References: <20200207135950.6655-1-ville.syrjala@linux.intel.com> <20200207135950.6655-7-ville.syrjala@linux.intel.com> <20200207163926.GN43062@phenom.ffwll.local> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200207163926.GN43062@phenom.ffwll.local> X-Patchwork-Hint: comment User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [Intel-gfx] [PATCH v2 6/6] drm: Validate encoder->possible_crtcs 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, Thomas Zimmermann , dri-devel@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 Fri, Feb 07, 2020 at 05:39:26PM +0100, Daniel Vetter wrote: > On Fri, Feb 07, 2020 at 03:59:50PM +0200, Ville Syrjala wrote: > > From: Ville Syrj=E4l=E4 > > = > > WARN if the encoder possible_crtcs is effectively empty or contains > > bits for non-existing crtcs. > > = > > TODO: Or should we perhapst just filter out any bit for a > > non-exisiting crtc? > > = > > Cc: Thomas Zimmermann > > Cc: Daniel Vetter > > Signed-off-by: Ville Syrj=E4l=E4 > = > >From a quick grep it looks like at least most drivers seem to get this > right. Worth a shot to find the hold-outs. > = > Two things: > - Imo also best to move into the drm_mode_config_validate I suggested. > - Please update the kerneldoc for drm_encoder.possible_crtcs to mention > that this will WARN if you get it wrong (and maybe remove the line that > most drivers screw this up). ack > = > Check itself lgtm. > -Daniel > = > > --- > > drivers/gpu/drm/drm_encoder.c | 18 ++++++++++++++++++ > > 1 file changed, 18 insertions(+) > > = > > diff --git a/drivers/gpu/drm/drm_encoder.c b/drivers/gpu/drm/drm_encode= r.c > > index bc2246f27e0d..f16b2a2518d7 100644 > > --- a/drivers/gpu/drm/drm_encoder.c > > +++ b/drivers/gpu/drm/drm_encoder.c > > @@ -107,6 +107,23 @@ static void validate_possible_clones(struct drm_en= coder *encoder) > > encoder->possible_clones, encoder_mask); > > } > > = > > +static void validate_possible_crtcs(struct drm_encoder *encoder) > > +{ > > + struct drm_device *dev =3D encoder->dev; > > + struct drm_crtc *crtc; > > + u32 crtc_mask =3D 0; > > + > > + drm_for_each_crtc(crtc, dev) > > + crtc_mask |=3D drm_crtc_mask(crtc); > > + > > + WARN((encoder->possible_crtcs & crtc_mask) =3D=3D 0 || > > + (encoder->possible_crtcs & ~crtc_mask) !=3D 0, > > + "Bogus possible_crtcs: " > > + "[ENCODER:%d:%s] possible_crtcs=3D0x%x (full crtc mask=3D0x%x)\n= ", > > + encoder->base.id, encoder->name, > > + encoder->possible_crtcs, crtc_mask); > > +} > > + > > int drm_encoder_register_all(struct drm_device *dev) > > { > > struct drm_encoder *encoder; > > @@ -115,6 +132,7 @@ int drm_encoder_register_all(struct drm_device *dev) > > fixup_possible_clones(dev); > > = > > drm_for_each_encoder(encoder, dev) { > > + validate_possible_crtcs(encoder); > > validate_possible_clones(encoder); > > = > > if (encoder->funcs->late_register) > > -- = > > 2.24.1 > > = > = > -- = > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch -- = Ville Syrj=E4l=E4 Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx