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 52B2EC55181 for ; Tue, 21 Apr 2020 10:08:21 +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 339802076C for ; Tue, 21 Apr 2020 10:08:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 339802076C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=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 65DFA6E903; Tue, 21 Apr 2020 10:08:20 +0000 (UTC) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1E8766E02B; Tue, 21 Apr 2020 10:08:19 +0000 (UTC) IronPort-SDR: kYo5uXk6NYgh//0lkCNnTnpeP4cSC3f5MxkopeojqyCaVN1fztNoXVLwfP2Wf3vU9AKPh5d6Zx w/EF1mO/Ydpg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Apr 2020 03:08:18 -0700 IronPort-SDR: fYSWDSNx4Bs3e1pquewSPz2vHeLjAsG7fctOfmqy3hUMMh4Eh6qsMXct9RyD9uOo2FO9xQvfQO TnNXYk1EvV5A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,410,1580803200"; d="scan'208";a="279584406" Received: from plaxmina-desktop.iind.intel.com ([10.145.162.62]) by fmsmga004.fm.intel.com with ESMTP; 21 Apr 2020 03:08:14 -0700 Date: Tue, 21 Apr 2020 15:29:49 +0530 From: "Bharadiya,Pankaj" To: Jani Nikula Subject: Re: [PATCH 15/18] drm/i915/i915_drv: Prefer drm_WARN_ON over WARN_ON Message-ID: <20200421095949.GA436@plaxmina-desktop.iind.intel.com> References: <20200406112800.23762-1-pankaj.laxminarayan.bharadiya@intel.com> <20200406112800.23762-16-pankaj.laxminarayan.bharadiya@intel.com> <87o8rlz1o8.fsf@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <87o8rlz1o8.fsf@intel.com> User-Agent: Mutt/1.5.24 (2015-08-30) 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: David Airlie , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Rodrigo Vivi Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Tue, Apr 21, 2020 at 11:24:39AM +0300, Jani Nikula wrote: > On Mon, 06 Apr 2020, Pankaj Bharadiya wrote: > > struct drm_device specific drm_WARN* macros include device information > > in the backtrace, so we know what device the warnings originate from. > > > > Prefer drm_WARN_ON over WARN_ON. > > > > Signed-off-by: Pankaj Bharadiya > > --- > > drivers/gpu/drm/i915/i915_drv.h | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > > index e9ee4daa9320..be33cab6403d 100644 > > --- a/drivers/gpu/drm/i915/i915_drv.h > > +++ b/drivers/gpu/drm/i915/i915_drv.h > > @@ -1647,7 +1647,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, > > #define HAS_DISPLAY(dev_priv) (INTEL_INFO(dev_priv)->pipe_mask != 0) > > > > /* Only valid when HAS_DISPLAY() is true */ > > -#define INTEL_DISPLAY_ENABLED(dev_priv) (WARN_ON(!HAS_DISPLAY(dev_priv)), !i915_modparams.disable_display) > > +#define INTEL_DISPLAY_ENABLED(dev_priv) \ > > + (drm_WARN_ON(&dev_priv->drm, !HAS_DISPLAY(dev_priv)), !i915_modparams.disable_display) > > Needs parens around the dev_priv macro argument. Yeah, missed it. Thanks for pointing out. Thanks, Pankaj > > BR, > Jani. > > > > > static inline bool intel_vtd_active(void) > > { > > -- > Jani Nikula, Intel Open Source Graphics Center _______________________________________________ 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=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 9D8F7C2BA19 for ; Tue, 21 Apr 2020 10:08:20 +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 7942D2076C for ; Tue, 21 Apr 2020 10:08:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7942D2076C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=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 08D736E02B; Tue, 21 Apr 2020 10:08:20 +0000 (UTC) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1E8766E02B; Tue, 21 Apr 2020 10:08:19 +0000 (UTC) IronPort-SDR: kYo5uXk6NYgh//0lkCNnTnpeP4cSC3f5MxkopeojqyCaVN1fztNoXVLwfP2Wf3vU9AKPh5d6Zx w/EF1mO/Ydpg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Apr 2020 03:08:18 -0700 IronPort-SDR: fYSWDSNx4Bs3e1pquewSPz2vHeLjAsG7fctOfmqy3hUMMh4Eh6qsMXct9RyD9uOo2FO9xQvfQO TnNXYk1EvV5A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,410,1580803200"; d="scan'208";a="279584406" Received: from plaxmina-desktop.iind.intel.com ([10.145.162.62]) by fmsmga004.fm.intel.com with ESMTP; 21 Apr 2020 03:08:14 -0700 Date: Tue, 21 Apr 2020 15:29:49 +0530 From: "Bharadiya,Pankaj" To: Jani Nikula Message-ID: <20200421095949.GA436@plaxmina-desktop.iind.intel.com> References: <20200406112800.23762-1-pankaj.laxminarayan.bharadiya@intel.com> <20200406112800.23762-16-pankaj.laxminarayan.bharadiya@intel.com> <87o8rlz1o8.fsf@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <87o8rlz1o8.fsf@intel.com> User-Agent: Mutt/1.5.24 (2015-08-30) Subject: Re: [Intel-gfx] [PATCH 15/18] drm/i915/i915_drv: Prefer drm_WARN_ON over 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: David Airlie , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Tue, Apr 21, 2020 at 11:24:39AM +0300, Jani Nikula wrote: > On Mon, 06 Apr 2020, Pankaj Bharadiya wrote: > > struct drm_device specific drm_WARN* macros include device information > > in the backtrace, so we know what device the warnings originate from. > > > > Prefer drm_WARN_ON over WARN_ON. > > > > Signed-off-by: Pankaj Bharadiya > > --- > > drivers/gpu/drm/i915/i915_drv.h | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > > index e9ee4daa9320..be33cab6403d 100644 > > --- a/drivers/gpu/drm/i915/i915_drv.h > > +++ b/drivers/gpu/drm/i915/i915_drv.h > > @@ -1647,7 +1647,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, > > #define HAS_DISPLAY(dev_priv) (INTEL_INFO(dev_priv)->pipe_mask != 0) > > > > /* Only valid when HAS_DISPLAY() is true */ > > -#define INTEL_DISPLAY_ENABLED(dev_priv) (WARN_ON(!HAS_DISPLAY(dev_priv)), !i915_modparams.disable_display) > > +#define INTEL_DISPLAY_ENABLED(dev_priv) \ > > + (drm_WARN_ON(&dev_priv->drm, !HAS_DISPLAY(dev_priv)), !i915_modparams.disable_display) > > Needs parens around the dev_priv macro argument. Yeah, missed it. Thanks for pointing out. Thanks, Pankaj > > BR, > Jani. > > > > > static inline bool intel_vtd_active(void) > > { > > -- > Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx