From patchwork Tue Aug 30 09:34:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 12959011 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 46B2AECAAA1 for ; Tue, 30 Aug 2022 09:34:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C491210E029; Tue, 30 Aug 2022 09:34:38 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id A404F10E029 for ; Tue, 30 Aug 2022 09:34:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1661852073; x=1693388073; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=lHw4MmjmzWhv2HJ17HgYfpkprfYD0w+TuCeakv5N7+s=; b=T/Sanf1EO/PwBh3gbLYO0z8FnYebSjJL/Kmf6+dL7yvXzDkWteMq8NNK SW0+LzR4jic4QNrSHej4pmEV7xcBYTKslF6jclgaCJdCEO3i360rjHRm6 7kICsCD571W8datuSYFbtUACM/f0+eZpX2QNoCmCbhLTNG88yF9i/8KNQ 51wRAC0cmh5HbR+Qnw3hXhP8AH1Fn6BfE5ZXyA/V7/zMYGXEJjvfGW7uM PrRY3x2hqf//kDb60ynR/vhiTp6kFTYDoqBdM2308yUBFmiPO4mX5ERE1 hdV4upI5QTKb/re1GI6bis/qACJof0W6m/xfKmej88xWYdZIvJJGSewhx Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10454"; a="293875109" X-IronPort-AV: E=Sophos;i="5.93,274,1654585200"; d="scan'208";a="293875109" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Aug 2022 02:34:21 -0700 X-IronPort-AV: E=Sophos;i="5.93,274,1654585200"; d="scan'208";a="641303290" Received: from amrabet-mobl.ger.corp.intel.com (HELO localhost) ([10.252.41.211]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Aug 2022 02:34:19 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Tue, 30 Aug 2022 12:34:07 +0300 Message-Id: <20220830093411.1511040-1-jani.nikula@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH v2 1/5] drm/i915/crt: remove BUG_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: jani.nikula@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Avoid BUG_ON(). We don't have such checks on output type anywhere else either, so just remove. Suggested-by: Ville Syrjälä Signed-off-by: Jani Nikula Reviewed-by: Ville Syrjälä Reviewed-by: Andrzej Hajda --- drivers/gpu/drm/i915/display/intel_crt.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_crt.c b/drivers/gpu/drm/i915/display/intel_crt.c index 6a3893c8ff22..d766c506b235 100644 --- a/drivers/gpu/drm/i915/display/intel_crt.c +++ b/drivers/gpu/drm/i915/display/intel_crt.c @@ -643,8 +643,6 @@ static bool intel_crt_detect_ddc(struct drm_connector *connector) struct i2c_adapter *i2c; bool ret = false; - BUG_ON(crt->base.type != INTEL_OUTPUT_ANALOG); - i2c = intel_gmbus_get_adapter(dev_priv, dev_priv->vbt.crt_ddc_pin); edid = intel_crt_get_edid(connector, i2c); From patchwork Tue Aug 30 09:34:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 12959010 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 376E2ECAAA1 for ; Tue, 30 Aug 2022 09:34:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 076B110E027; Tue, 30 Aug 2022 09:34:32 +0000 (UTC) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2812B10E027 for ; Tue, 30 Aug 2022 09:34: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=1661852066; x=1693388066; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=IGrPmKYwb6iykR7hgUurCWympqbgPeVEKPmywcUZRhs=; b=Gi+aqR7nzD3+TC6LRr/0rgbRMGQxtrf0rso1wxQ/mAuSLVKS7W6trYFn 9f659g+AcK2BzrhxeDNmo09VihqwDTnmYb9JcWVgmDGDYxU8c3ucguio2 k0Url0vSP4xSXegbfeO4KeyAVwdCmDhUtx2ONW6nMPXsseKDJGCkgmBra xO+noxCLt7BykEu13hQCf/05E1O58U7sQ5ln+UHPF3KXh42pwWb82XT1O DMJfWE9EQCmFn58QaK14BpZHl6lqLY9AkZX6e2CYAEgr8+SpCIj3xF6cJ 4RnWJrk7SxLHmhMhw5oeEU84fVC8XQ39jUoyBZeFoiJb0e8qRhzGdP0ee Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10454"; a="296409243" X-IronPort-AV: E=Sophos;i="5.93,274,1654585200"; d="scan'208";a="296409243" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Aug 2022 02:34:25 -0700 X-IronPort-AV: E=Sophos;i="5.93,274,1654585200"; d="scan'208";a="939953347" Received: from amrabet-mobl.ger.corp.intel.com (HELO localhost) ([10.252.41.211]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Aug 2022 02:34:23 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Tue, 30 Aug 2022 12:34:08 +0300 Message-Id: <20220830093411.1511040-2-jani.nikula@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220830093411.1511040-1-jani.nikula@intel.com> References: <20220830093411.1511040-1-jani.nikula@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH v2 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: jani.nikula@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" 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[]. v2: Rebase Reviewed-by: Ville Syrjälä Signed-off-by: Jani Nikula Reviewed-by: Andrzej Hajda --- 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 bbe142056c7c..ed267c918009 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->display.dpll.shared_dplls))) + break; + drm_WARN_ON(&dev_priv->drm, i != dpll_info[i].id); dev_priv->display.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->display.dpll.mgr = dpll_mgr; dev_priv->display.dpll.num_shared_dpll = i; mutex_init(&dev_priv->display.dpll.lock); - - BUG_ON(dev_priv->display.dpll.num_shared_dpll > I915_NUM_PLLS); } /** From patchwork Tue Aug 30 09:34:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 12959014 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 723C0C0502A for ; Tue, 30 Aug 2022 09:34:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D465A10E036; Tue, 30 Aug 2022 09:34:56 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 03E2010E02E for ; Tue, 30 Aug 2022 09:34:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1661852074; x=1693388074; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LUFMV7RfzL0S//iwqhaT2bdQrD6ybjc/o7SCwKgcWD8=; b=gm5UbK7xbUdb6ad7zo7AAYrHmTb/ncDVhrzFiTmOy9RXvqWvsRaetufa Nd+IvDbQoq1SB9SAlEvJmTbyxIlgiUGf9Y7SjM+rUB8CSrMim/DOZePgr DusiZKmPMuwedkV97vFlgA/hIVlVimPj9Hf5xJ80WpPMEse2jdt/BERpK zTm+9IjaHvCDcUBs2Z8K7quNxwoNIZUs3fYGZus8m284NLhwHIpVJoa8i SlChlt90zOfDIRdHIVtidlEwUGwPh9fuE0B6MV5itTwQcKJOVV5RyBwt8 4nbUT8R2llzzcytF7lrWUaUoT+vY5Q1aNhTIEZ69a6mPkfMj3s5hbSwh/ A==; X-IronPort-AV: E=McAfee;i="6500,9779,10454"; a="293875124" X-IronPort-AV: E=Sophos;i="5.93,274,1654585200"; d="scan'208";a="293875124" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Aug 2022 02:34:29 -0700 X-IronPort-AV: E=Sophos;i="5.93,274,1654585200"; d="scan'208";a="588532595" Received: from amrabet-mobl.ger.corp.intel.com (HELO localhost) ([10.252.41.211]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Aug 2022 02:34:27 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Tue, 30 Aug 2022 12:34:09 +0300 Message-Id: <20220830093411.1511040-3-jani.nikula@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220830093411.1511040-1-jani.nikula@intel.com> References: <20220830093411.1511040-1-jani.nikula@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH v2 3/5] drm/i915/pch: 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: jani.nikula@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Avoid BUG_ON(). Replace with drm_WARN_ON(). Reviewed-by: Ville Syrjälä Signed-off-by: Jani Nikula Reviewed-by: Andrzej Hajda --- drivers/gpu/drm/i915/display/intel_pch_refclk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_pch_refclk.c b/drivers/gpu/drm/i915/display/intel_pch_refclk.c index ee72400759a3..2f95a0c65f8b 100644 --- a/drivers/gpu/drm/i915/display/intel_pch_refclk.c +++ b/drivers/gpu/drm/i915/display/intel_pch_refclk.c @@ -654,7 +654,7 @@ static void ilk_init_pch_refclk(struct drm_i915_private *dev_priv) } } - BUG_ON(val != final); + drm_WARN_ON(&dev_priv->drm, val != final); } /* From patchwork Tue Aug 30 09:34:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 12959013 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 8AEEEECAAD4 for ; Tue, 30 Aug 2022 09:34:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4FDBA10E035; Tue, 30 Aug 2022 09:34:55 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5970510E035 for ; Tue, 30 Aug 2022 09:34:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1661852074; x=1693388074; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=DfNuiNPNUjN5HGtGFuP5IdIknTModHq9xd/3VtKfTlY=; b=i4I6fPgZrCrqaYPLPf4lJ/BxFvyLwrEgSepZ1tMrMZselSHkKs20iAuj mHq5zGbRFBuCPGcPU9otQNQKG7cXcJ/FbkPPMdDUBQKrffLgkTDxsgRKg tMUvrEStspxwpvVmKqLMsdNWEPstPTH8Mk8vN3ugDkPml4Bm2cAWT3zmT o82elOYeu3ZwhNEc0QjEzgpfsdaLw3U5AdPm9mWPeJdEGTZ5Z3+Lc8cV2 v+tWZD948585hONBIJphqmuoLcx02QRv8EZYnmcIL92J6RWLCoDIgCrjt 9I75jR9RNqaAQgy48VPziexKIEQdv6GbxLctI5brJ28hFgULlYu2N6yUo Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10454"; a="381427677" X-IronPort-AV: E=Sophos;i="5.93,274,1654585200"; d="scan'208";a="381427677" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Aug 2022 02:34:33 -0700 X-IronPort-AV: E=Sophos;i="5.93,274,1654585200"; d="scan'208";a="562575766" Received: from amrabet-mobl.ger.corp.intel.com (HELO localhost) ([10.252.41.211]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Aug 2022 02:34:32 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Tue, 30 Aug 2022 12:34:10 +0300 Message-Id: <20220830093411.1511040-4-jani.nikula@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220830093411.1511040-1-jani.nikula@intel.com> References: <20220830093411.1511040-1-jani.nikula@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH v2 4/5] drm/i915/perf: replace BUG_ON() with 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: jani.nikula@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Avoid BUG_ON(). Replace with WARN_ON() and early return. Reviewed-by: Ville Syrjälä Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/i915_perf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c index f3c23fe9ad9c..0defbb43ceea 100644 --- a/drivers/gpu/drm/i915/i915_perf.c +++ b/drivers/gpu/drm/i915/i915_perf.c @@ -1376,7 +1376,8 @@ static void i915_oa_stream_destroy(struct i915_perf_stream *stream) { struct i915_perf *perf = stream->perf; - BUG_ON(stream != perf->exclusive_stream); + if (WARN_ON(stream != perf->exclusive_stream)) + return; /* * Unset exclusive_stream first, it will be checked while disabling From patchwork Tue Aug 30 09:34:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 12959012 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 69E9EECAAA1 for ; Tue, 30 Aug 2022 09:34:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A54A910E02E; Tue, 30 Aug 2022 09:34:44 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0081610E029 for ; Tue, 30 Aug 2022 09:34:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1661852077; x=1693388077; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=b4tKhL95xF1aKRCELJzKrs10vKJqRXk5tnncqYqPnJU=; b=n8AS9nxuq7jyjbmhIznEb56LPo+4fwfhsfBBrsrnKO/u1zfIDMdZG825 cbANFYFi3umOV6553guGRNK1VqF5wHneWOa2eIDuP9FmynEKwk17U9BZW XtRHIYOFQ4zZFv7k/JIBHqI4HjeqT+7mTpXG9FyVBKSkCTrNT2HKjctmA fUK/U0dqBM1paXQTDFWgfuthnOnQu58YOz62B5dt2qh9epdl4tkVHv6J5 lVEfyl0cTqTIq+4xkQfxr1PD5vSbATgYIAB9sdlYo2dZ8peNrf4ebsC4S Cx4/+rKOt+nA2dOjd3o8RVlJAuRSY/LC+bGqNaSH+KXyxawASmYpf9Ttj w==; X-IronPort-AV: E=McAfee;i="6500,9779,10454"; a="295132410" X-IronPort-AV: E=Sophos;i="5.93,274,1654585200"; d="scan'208";a="295132410" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Aug 2022 02:34:37 -0700 X-IronPort-AV: E=Sophos;i="5.93,274,1654585200"; d="scan'208";a="679969527" Received: from amrabet-mobl.ger.corp.intel.com (HELO localhost) ([10.252.41.211]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Aug 2022 02:34:36 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Tue, 30 Aug 2022 12:34:11 +0300 Message-Id: <20220830093411.1511040-5-jani.nikula@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220830093411.1511040-1-jani.nikula@intel.com> References: <20220830093411.1511040-1-jani.nikula@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH v2 5/5] drm/i915/fence: replace BUG_ON() with BUILD_BUG_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: jani.nikula@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Avoid BUG_ON(). Since __i915_sw_fence_init() is always called via a wrapper macro, we can replace it with a compile time BUILD_BUG_ON(). Reviewed-by: Ville Syrjälä Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/i915_sw_fence.c | 2 -- drivers/gpu/drm/i915/i915_sw_fence.h | 6 +++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_sw_fence.c b/drivers/gpu/drm/i915/i915_sw_fence.c index ae984c66c48a..6fc0d1b89690 100644 --- a/drivers/gpu/drm/i915/i915_sw_fence.c +++ b/drivers/gpu/drm/i915/i915_sw_fence.c @@ -241,8 +241,6 @@ void __i915_sw_fence_init(struct i915_sw_fence *fence, const char *name, struct lock_class_key *key) { - BUG_ON(!fn); - __init_waitqueue_head(&fence->wait, name, key); fence->fn = fn; #ifdef CONFIG_DRM_I915_SW_FENCE_CHECK_DAG diff --git a/drivers/gpu/drm/i915/i915_sw_fence.h b/drivers/gpu/drm/i915/i915_sw_fence.h index a7c603bc1b01..619fc5a22f0c 100644 --- a/drivers/gpu/drm/i915/i915_sw_fence.h +++ b/drivers/gpu/drm/i915/i915_sw_fence.h @@ -48,11 +48,15 @@ void __i915_sw_fence_init(struct i915_sw_fence *fence, do { \ static struct lock_class_key __key; \ \ + BUILD_BUG_ON((fn) == NULL); \ __i915_sw_fence_init((fence), (fn), #fence, &__key); \ } while (0) #else #define i915_sw_fence_init(fence, fn) \ - __i915_sw_fence_init((fence), (fn), NULL, NULL) +do { \ + BUILD_BUG_ON((fn) == NULL); \ + __i915_sw_fence_init((fence), (fn), NULL, NULL); \ +} while (0) #endif void i915_sw_fence_reinit(struct i915_sw_fence *fence);