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 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 78CB9C433E0 for ; Mon, 25 May 2020 13:57:28 +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 56649207C3 for ; Mon, 25 May 2020 13:57:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 56649207C3 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 CD15689E43; Mon, 25 May 2020 13:57:27 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4F86089E43 for ; Mon, 25 May 2020 13:57:26 +0000 (UTC) IronPort-SDR: 7JYVRxwO1V0KX4kX3dzZxzmyessOWyC+6KswRgu54bn5Yc30tEkbFaUJvxepg6/MB63MInqU1H w20dqGsavR7w== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 May 2020 06:57:25 -0700 IronPort-SDR: FZeCNU4ixac28TxDRfPEz3i6ZLmo8xvlRi7DFF0OzaFmYYgOdPf+yT5RGDtSonkBERk8n+7KSE Jw5JLV3cgwZw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,433,1583222400"; d="scan'208";a="441738068" Received: from gaia.fi.intel.com ([10.237.72.192]) by orsmga005.jf.intel.com with ESMTP; 25 May 2020 06:57:24 -0700 Received: by gaia.fi.intel.com (Postfix, from userid 1000) id 047CA5C2C45; Mon, 25 May 2020 16:55:02 +0300 (EEST) From: Mika Kuoppala To: Chris Wilson , intel-gfx@lists.freedesktop.org In-Reply-To: <20200525075347.582-3-chris@chris-wilson.co.uk> References: <20200525075347.582-1-chris@chris-wilson.co.uk> <20200525075347.582-3-chris@chris-wilson.co.uk> Date: Mon, 25 May 2020 16:55:02 +0300 Message-ID: <87ftbot8zt.fsf@gaia.fi.intel.com> MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH 03/12] drm/i915/gem: Suppress some random warnings 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: Chris Wilson Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Chris Wilson writes: > Leave the error propagation in place, but limit the warnings to only > show up in CI if the unlikely errors are hit. > > Signed-off-by: Chris Wilson Reviewed-by: Mika Kuoppala > --- > drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 3 +-- > drivers/gpu/drm/i915/gem/i915_gem_phys.c | 3 +-- > drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 3 +-- > drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 2 +- > 4 files changed, 4 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > index e4fb6c372537..219a36995b96 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > @@ -1626,8 +1626,7 @@ eb_relocate_entry(struct i915_execbuffer *eb, > err = i915_vma_bind(target->vma, > target->vma->obj->cache_level, > PIN_GLOBAL, NULL); > - if (drm_WARN_ONCE(&i915->drm, err, > - "Unexpected failure to bind target VMA!")) > + if (err) > return err; > } > } > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_phys.c b/drivers/gpu/drm/i915/gem/i915_gem_phys.c > index 4c1c7232b024..12245a47e5fb 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_phys.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_phys.c > @@ -27,8 +27,7 @@ static int i915_gem_object_get_pages_phys(struct drm_i915_gem_object *obj) > void *dst; > int i; > > - if (drm_WARN_ON(obj->base.dev, > - i915_gem_object_needs_bit17_swizzle(obj))) > + if (GEM_WARN_ON(i915_gem_object_needs_bit17_swizzle(obj))) > return -EINVAL; > > /* > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c > index 7aff3514d97a..7cf8548ff708 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c > @@ -147,8 +147,7 @@ static int shmem_get_pages(struct drm_i915_gem_object *obj) > last_pfn = page_to_pfn(page); > > /* Check that the i965g/gm workaround works. */ > - drm_WARN_ON(&i915->drm, > - (gfp & __GFP_DMA32) && (last_pfn >= 0x00100000UL)); > + GEM_BUG_ON(gfp & __GFP_DMA32 && last_pfn >= 0x00100000UL); > } > if (sg) { /* loop terminated early; short sg table */ > sg_page_sizes |= sg->length; > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c > index 8b0708708671..2226146b01c9 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c > @@ -235,7 +235,7 @@ i915_gem_userptr_init__mmu_notifier(struct drm_i915_gem_object *obj, > if (flags & I915_USERPTR_UNSYNCHRONIZED) > return capable(CAP_SYS_ADMIN) ? 0 : -EPERM; > > - if (drm_WARN_ON(obj->base.dev, obj->userptr.mm == NULL)) > + if (GEM_WARN_ON(!obj->userptr.mm)) > return -EINVAL; > > mn = i915_mmu_notifier_find(obj->userptr.mm); > -- > 2.20.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx