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 855DFECAAD4 for ; Fri, 26 Aug 2022 11:08:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 587E110E1BC; Fri, 26 Aug 2022 11:08:30 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6213C10E1BC for ; Fri, 26 Aug 2022 11:08:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1661512106; x=1693048106; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=GZk7dzbn8Dc6JJRPfc8YZlcMsGyWTFYK7X8l7V8YHzs=; b=YiMHvNDGxdnGvmQq1l57UgB5mz8u1pp5czo0hmzfBz9ngjhKvzj4pCdr gHRmA7rRchcMZvjBbV5eS96xrHv/o7uSeccRyBKra56goowvsWkXvGnds 92GCz7ok//XW0/8muSprnWtmswvj+08KkMmbzHNcNFF2li8Styc9AiUls NbPjN4oHI6te6PQGRe++E3637Oh1CQKCRrn2iM7n/lp2YwJV6UBQJ+NA7 tPuqaGjpo+3CHTMasjmSpLiNIlnYy1uBvmBtYmLxzJiTGuOuarIQ719zf XiSC5LkwWsLxZyPFu1fAK2H7wsApGEy0ORtI8vsUNrA+Zh7Ld5gLy7YoD A==; X-IronPort-AV: E=McAfee;i="6500,9779,10450"; a="380776200" X-IronPort-AV: E=Sophos;i="5.93,265,1654585200"; d="scan'208";a="380776200" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Aug 2022 04:08:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,265,1654585200"; d="scan'208";a="640018677" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.191]) by orsmga008.jf.intel.com with SMTP; 26 Aug 2022 04:08:23 -0700 Received: by stinkbox (sSMTP sendmail emulation); Fri, 26 Aug 2022 14:08:22 +0300 Date: Fri, 26 Aug 2022 14:08:22 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Jani Nikula Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Patchwork-Hint: comment Subject: Re: [Intel-gfx] [PATCH 2/5] drm/i915/dpll: replace BUG_ON() with drm_WARN_ON() 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 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Fri, Aug 26, 2022 at 11:38:14AM +0300, Jani Nikula wrote: > Avoid BUG_ON(). Actually check the dpll count and bail out loudly with > drm_WARN_ON() from the loop before overflowing > i915->dpll.shared_dplls[]. > > Signed-off-by: Jani Nikula > --- > drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c > index 118598c9a809..8dd405553cfa 100644 > --- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c > +++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c > @@ -4199,6 +4199,10 @@ void intel_shared_dpll_init(struct drm_i915_private *dev_priv) > dpll_info = dpll_mgr->dpll_info; > > for (i = 0; dpll_info[i].name; i++) { > + if (drm_WARN_ON(&dev_priv->drm, > + i >= ARRAY_SIZE(dev_priv->dpll.shared_dplls))) > + break; Shame we can't neatly use a BUILD_BUG_ON() when assigning .dpll_info. For patches 2-5 Reviewed-by: Ville Syrjälä > + > drm_WARN_ON(&dev_priv->drm, i != dpll_info[i].id); > dev_priv->dpll.shared_dplls[i].info = &dpll_info[i]; > } > @@ -4206,8 +4210,6 @@ void intel_shared_dpll_init(struct drm_i915_private *dev_priv) > dev_priv->dpll.mgr = dpll_mgr; > dev_priv->dpll.num_shared_dpll = i; > mutex_init(&dev_priv->dpll.lock); > - > - BUG_ON(dev_priv->dpll.num_shared_dpll > I915_NUM_PLLS); > } > > /** > -- > 2.34.1 -- Ville Syrjälä Intel