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=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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 E6120C2BA19 for ; Tue, 21 Apr 2020 08:26:31 +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 C6AE0206B8 for ; Tue, 21 Apr 2020 08:26:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C6AE0206B8 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 6DEB089F4A; Tue, 21 Apr 2020 08:26:31 +0000 (UTC) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1B9D989F47; Tue, 21 Apr 2020 08:26:30 +0000 (UTC) IronPort-SDR: v72buYbjRFzMCpZJ4llSoryI0sqS970UYqwrjT5+DNINs06i/a6qF203SsVKKMKYKbV5W2uxW/ bwSp2mtfkkvQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Apr 2020 01:26:29 -0700 IronPort-SDR: H7UK2j3E+9YgMxNSKe8FYk6iiKnL5LnwaqeMgpuQHPUVq2FuCEwIVEO95YAQHyIMV2DhEoCRh2 Gh5PGRnr0f8Q== X-IronPort-AV: E=Sophos;i="5.72,409,1580803200"; d="scan'208";a="402119034" Received: from parkernx-mobl.ger.corp.intel.com (HELO localhost) ([10.249.46.80]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Apr 2020 01:26:25 -0700 From: Jani Nikula To: Pankaj Bharadiya , daniel@ffwll.ch, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Joonas Lahtinen , Rodrigo Vivi , David Airlie In-Reply-To: <20200406112800.23762-18-pankaj.laxminarayan.bharadiya@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20200406112800.23762-1-pankaj.laxminarayan.bharadiya@intel.com> <20200406112800.23762-18-pankaj.laxminarayan.bharadiya@intel.com> Date: Tue, 21 Apr 2020 11:26:22 +0300 Message-ID: <87lfmpz1ld.fsf@intel.com> MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH 17/18] drm/i915/pm: 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" 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. > > Conversion is done with below sementic patch: > > @@ > identifier func, T; > @@ > func(...) { > ... > struct intel_crtc *T = ...; > <+... > -WARN_ON( > +drm_WARN_ON(T->base.dev, > ...) > ...+> > > } > > @@ > identifier func, T; > @@ > func(struct intel_crtc_state *T,...) { > <+... > -WARN_ON( > +drm_WARN_ON(T->uapi.crtc->dev, > ...) > ...+> > > } > > Signed-off-by: Pankaj Bharadiya > --- > drivers/gpu/drm/i915/intel_pm.c | 57 ++++++++++++++++++--------------- > 1 file changed, 32 insertions(+), 25 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index 8375054ba27d..b2d22fdaf3db 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -1464,8 +1464,8 @@ static int g4x_compute_intermediate_wm(struct intel_crtc_state *new_crtc_state) > max(optimal->wm.plane[plane_id], > active->wm.plane[plane_id]); > > - WARN_ON(intermediate->wm.plane[plane_id] > > - g4x_plane_fifo_size(plane_id, G4X_WM_LEVEL_NORMAL)); > + drm_WARN_ON(crtc->base.dev, intermediate->wm.plane[plane_id] > > + g4x_plane_fifo_size(plane_id, G4X_WM_LEVEL_NORMAL)); > } > > intermediate->sr.plane = max(optimal->sr.plane, > @@ -1482,21 +1482,25 @@ static int g4x_compute_intermediate_wm(struct intel_crtc_state *new_crtc_state) > intermediate->hpll.fbc = max(optimal->hpll.fbc, > active->hpll.fbc); > > - WARN_ON((intermediate->sr.plane > > - g4x_plane_fifo_size(PLANE_PRIMARY, G4X_WM_LEVEL_SR) || > - intermediate->sr.cursor > > - g4x_plane_fifo_size(PLANE_CURSOR, G4X_WM_LEVEL_SR)) && > - intermediate->cxsr); > - WARN_ON((intermediate->sr.plane > > - g4x_plane_fifo_size(PLANE_PRIMARY, G4X_WM_LEVEL_HPLL) || > - intermediate->sr.cursor > > - g4x_plane_fifo_size(PLANE_CURSOR, G4X_WM_LEVEL_HPLL)) && > - intermediate->hpll_en); > - > - WARN_ON(intermediate->sr.fbc > g4x_fbc_fifo_size(1) && > - intermediate->fbc_en && intermediate->cxsr); > - WARN_ON(intermediate->hpll.fbc > g4x_fbc_fifo_size(2) && > - intermediate->fbc_en && intermediate->hpll_en); > + drm_WARN_ON(crtc->base.dev, > + (intermediate->sr.plane > > + g4x_plane_fifo_size(PLANE_PRIMARY, G4X_WM_LEVEL_SR) || > + intermediate->sr.cursor > > + g4x_plane_fifo_size(PLANE_CURSOR, G4X_WM_LEVEL_SR)) && > + intermediate->cxsr); > + drm_WARN_ON(crtc->base.dev, > + (intermediate->sr.plane > > + g4x_plane_fifo_size(PLANE_PRIMARY, G4X_WM_LEVEL_HPLL) || > + intermediate->sr.cursor > > + g4x_plane_fifo_size(PLANE_CURSOR, G4X_WM_LEVEL_HPLL)) && > + intermediate->hpll_en); > + > + drm_WARN_ON(crtc->base.dev, > + intermediate->sr.fbc > g4x_fbc_fifo_size(1) && > + intermediate->fbc_en && intermediate->cxsr); > + drm_WARN_ON(crtc->base.dev, > + intermediate->hpll.fbc > g4x_fbc_fifo_size(2) && > + intermediate->fbc_en && intermediate->hpll_en); Please add a i915 local variable and use &i915->drm. > > out: > /* > @@ -1748,11 +1752,11 @@ static int vlv_compute_fifo(struct intel_crtc_state *crtc_state) > fifo_left -= plane_extra; > } > > - WARN_ON(active_planes != 0 && fifo_left != 0); > + drm_WARN_ON(crtc->base.dev, active_planes != 0 && fifo_left != 0); > > /* give it all to the first plane if none are active */ > if (active_planes == 0) { > - WARN_ON(fifo_left != fifo_size); > + drm_WARN_ON(crtc->base.dev, fifo_left != fifo_size); > fifo_state->plane[PLANE_PRIMARY] = fifo_left; > } > > @@ -4154,7 +4158,8 @@ skl_plane_downscale_amount(const struct intel_crtc_state *crtc_state, > uint_fixed_16_16_t fp_w_ratio, fp_h_ratio; > uint_fixed_16_16_t downscale_h, downscale_w; > > - if (WARN_ON(!intel_wm_plane_visible(crtc_state, plane_state))) > + if (drm_WARN_ON(crtc_state->uapi.crtc->dev, > + !intel_wm_plane_visible(crtc_state, plane_state))) > return u32_to_fixed16(0); > > /* > @@ -4815,7 +4820,7 @@ intel_get_linetime_us(const struct intel_crtc_state *crtc_state) > > pixel_rate = crtc_state->pixel_rate; > > - if (WARN_ON(pixel_rate == 0)) > + if (drm_WARN_ON(crtc_state->uapi.crtc->dev, pixel_rate == 0)) > return u32_to_fixed16(0); > > crtc_htotal = crtc_state->hw.adjusted_mode.crtc_htotal; > @@ -4832,7 +4837,8 @@ skl_adjusted_plane_pixel_rate(const struct intel_crtc_state *crtc_state, > uint_fixed_16_16_t downscale_amount; > > /* Shouldn't reach here on disabled planes... */ > - if (WARN_ON(!intel_wm_plane_visible(crtc_state, plane_state))) > + if (drm_WARN_ON(crtc_state->uapi.crtc->dev, > + !intel_wm_plane_visible(crtc_state, plane_state))) > return 0; > > /* > @@ -5261,9 +5267,10 @@ static int icl_build_plane_wm(struct intel_crtc_state *crtc_state, > const struct drm_framebuffer *fb = plane_state->hw.fb; > enum plane_id y_plane_id = plane_state->planar_linked_plane->id; > > - WARN_ON(!intel_wm_plane_visible(crtc_state, plane_state)); > - WARN_ON(!fb->format->is_yuv || > - fb->format->num_planes == 1); > + drm_WARN_ON(crtc_state->uapi.crtc->dev, > + !intel_wm_plane_visible(crtc_state, plane_state)); > + drm_WARN_ON(crtc_state->uapi.crtc->dev, !fb->format->is_yuv || > + fb->format->num_planes == 1); Ditto. BR, Jani. > > ret = skl_build_plane_wm_single(crtc_state, plane_state, > y_plane_id, 0); -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx