From patchwork Tue Oct 25 14:00:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 9394573 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 119B46077F for ; Tue, 25 Oct 2016 14:00:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 01E62290F9 for ; Tue, 25 Oct 2016 14:00:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E6C3229273; Tue, 25 Oct 2016 14:00:42 +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 074CA295B2 for ; Tue, 25 Oct 2016 14:00:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 171316E70B; Tue, 25 Oct 2016 14:00:37 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id CA3106E708 for ; Tue, 25 Oct 2016 14:00:33 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id d128so1249160wmf.0 for ; Tue, 25 Oct 2016 07:00:33 -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=2nQurH+sDoRh4Gb8SbFe75cLvycXI3agyj4uiGSqKTs=; b=a/hUiqWHFjHwmTuCLp7Elmqn1y+sCZODA92OU1pY9RWgP2esWWXvb6qhBWepu3sFg6 H27+wjZF7x/kHPIcC/38YuG9w+mo4B8TwmXx1lmNoMj31NrLYaL8PRImx+uf6Noo3GkN aCVUsPGSJvS99ob+g/M+9WkNlCwbGBUKrDD5adrseJddrLtXD8Jxo1i7NexY1oP8Dgbj SukxUTG8OnAP5QL5yKY7yRDfS0sLP0xkRlm4B3kL7hp09obRZuxARXRggSo17FAW7TPo Dl6e0oNHizB4eb1Ik+9hclEPOvytIaG666C+pUNECkLuV+jXJlpNWwDxypc7kN5Nos7v Ov9g== 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=2nQurH+sDoRh4Gb8SbFe75cLvycXI3agyj4uiGSqKTs=; b=a/q7Dmv7YBx/i7GpXB0/D/23uLGQX96nYlL31gSVadw28+N2qrYBqGXPQOcEXttHbL +8CUwkihCLouRE+200GDSpprzgXXcZ/oVVkFM890+L3m7LK6smyRLqPaJnA/sDOFyR9c jmhkHHce6PKpfez69YuP5HXFPXIAUlazPrvaNl5L2DDYcImUU1dLQcjWc1Qywooc/vDm 9Ba0vomR7kVXeEp/3fr0CG249yKyjk6bTVGy5qRK3h6tgTfZZYIjO6Hqu7VnG+in6bsJ KRnz6liOL5vcnQ5IUZU1vAcR9Hff8bZbnofcPe0UcmQdesSY4YLLk9irBtwdPEIUOjLk Eh4A== X-Gm-Message-State: ABUngvfXvOMRGXHXQUXF7z4joLkr1GXTwGEXtmxwnm2Y+knupaDUkGpOjnYASjBHLjNxYg== X-Received: by 10.194.103.41 with SMTP id ft9mr16416437wjb.8.1477404032434; Tue, 25 Oct 2016 07:00:32 -0700 (PDT) Received: from e31.Home ([2a02:c7d:9bd6:b000:3aa4:b23f:bb90:84b]) by smtp.gmail.com with ESMTPSA id f17sm3857627wmf.10.2016.10.25.07.00.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Oct 2016 07:00:31 -0700 (PDT) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Tue, 25 Oct 2016 15:00:24 +0100 Message-Id: <1477404024-2864-2-git-send-email-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477404024-2864-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1477404024-2864-1-git-send-email-tvrtko.ursulin@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 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 their single display related VMA is incorrect. Signed-off-by: Tvrtko Ursulin 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 0e26ee96856e..96f48d2c971c 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)); } /**