From patchwork Tue Oct 25 16:41:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 9395065 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A6A0460762 for ; Tue, 25 Oct 2016 16:41:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 990BE28E41 for ; Tue, 25 Oct 2016 16:41:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8BDF929278; Tue, 25 Oct 2016 16:41:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EC66B28E41 for ; Tue, 25 Oct 2016 16:41:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6DA5E6E185; Tue, 25 Oct 2016 16:41:23 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 000806E185 for ; Tue, 25 Oct 2016 16:41:20 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id m83so1585914wmc.6 for ; Tue, 25 Oct 2016 09:41:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ursulin-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/5+K+bivTfucU8nATYte4ILng19N+j1x75z1XVQ5i/I=; b=13Xf4LPAm7HLPmOMRh1si55d6koStDj18pOsNM9n80Xa8uyRWYqJyuPvaz3pN9/NgF y/jooivkVPyl6AahE1aphRXfpECmOjVLCoajhlkOrdvL1W6LZtzzy9PtBN0V7IhgcLK7 e4eXz7fonsUgZKX7IULDjHX19Zx7zRPGCjPl9YYwOxKiFZM5Hvo9PXAUTPDrOk6VWHDS Vxv0MO2eAEeqxBGtVecuRjkwb/0knfVOoZTJkGQaEqhSbFtrQSeFxK1OadI8c6cerK2r ZEvK97K1TJ5YqvBAM2RrfETrWfnkqCFvXypFC0Qo2cxXxyJrjj65nDXrM7sX8oJEwENy 5qtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/5+K+bivTfucU8nATYte4ILng19N+j1x75z1XVQ5i/I=; b=XCjbrW8k2fCGB25Nrg7+nVxKvFZTQga7+2ZgfIR/Gcl7JGSM50Lk6kjcWWnAhzsTzQ k/9hzne8xYOEfxlNPUhOenpU7jMSKLjg6cJYQNJ6nDC4sb9MxEUIWLnsO/YFg0eRJAjt /vik8g5gtJOHlDb9ca8e50i5YyfSkpvlE8o5BYPwaMKDpc1BKUrBPuGePU7e551wkSXr lNQi5svYU4KIOxmL3fyWciJLV1OQrg4lOVQ6E/A+GET0mexFy1+lHK4+nt+j/Pyzo0co qjvG8InpuuxH6IjjPdsUmexjfGEu65gEcp8P4s9lyjct1LlEwHYn75Hn35A8t9B1OfJQ AI5w== X-Gm-Message-State: ABUngvdBxPAQZvD3AoT3grtgBudpiLmA3nRm62cJYvOKbCpL4bRGLzzL0+58eVckf/EaPg== X-Received: by 10.194.153.199 with SMTP id vi7mr17428890wjb.137.1477413679610; Tue, 25 Oct 2016 09:41:19 -0700 (PDT) Received: from e31.Home ([2a02:c7d:9bd6:b000:3aa4:b23f:bb90:84b]) by smtp.gmail.com with ESMTPSA id r1sm25976843wjc.43.2016.10.25.09.41.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Oct 2016 09:41:18 -0700 (PDT) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Tue, 25 Oct 2016 17:41:12 +0100 Message-Id: <1477413672-3961-1-git-send-email-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <20161025142620.GF21423@nuc-i3427.alporthouse.com> References: <20161025142620.GF21423@nuc-i3427.alporthouse.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v2 2/2] drm/i915: Remove two invalid warns X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Tvrtko Ursulin Objects can have multiple VMAs used for display in which case assertion that objects must not be pinned for display more times than the current VMA is incorrect. v2: Commit message update. (Chris Wilson) Signed-off-by: Tvrtko Ursulin Fixes: 058d88c4330f ("drm/i915: Track pinned VMA") Cc: Chris Wilson Cc: Joonas Lahtinen Cc: Ville Syrjälä Reviewed-by: Chris Wilson --- drivers/gpu/drm/i915/i915_gem.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index eb524bdf0c35..87018df94d68 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -3595,8 +3595,6 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj, vma->display_alignment = max_t(u64, vma->display_alignment, alignment); - WARN_ON(obj->pin_display > i915_vma_pin_count(vma)); - i915_gem_object_flush_cpu_write_domain(obj); old_write_domain = obj->base.write_domain; @@ -3633,7 +3631,6 @@ i915_gem_object_unpin_from_display_plane(struct i915_vma *vma) list_move_tail(&vma->vm_link, &vma->vm->inactive_list); i915_vma_unpin(vma); - WARN_ON(vma->obj->pin_display > i915_vma_pin_count(vma)); } /**