From owner-svn-src-head@freebsd.org  Sat Oct 10 07:43:03 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C745E9D255B;
 Sat, 10 Oct 2015 07:43:03 +0000 (UTC)
 (envelope-from dumbbell@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 925E37AB;
 Sat, 10 Oct 2015 07:43:03 +0000 (UTC)
 (envelope-from dumbbell@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9A7h26n000545;
 Sat, 10 Oct 2015 07:43:02 GMT (envelope-from dumbbell@FreeBSD.org)
Received: (from dumbbell@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9A7h2OI000544;
 Sat, 10 Oct 2015 07:43:02 GMT (envelope-from dumbbell@FreeBSD.org)
Message-Id: <201510100743.t9A7h2OI000544@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dumbbell set sender to
 dumbbell@FreeBSD.org using -f
From: =?UTF-8?Q?Jean-S=c3=a9bastien_P=c3=a9dron?= <dumbbell@FreeBSD.org>
Date: Sat, 10 Oct 2015 07:43:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r289109 - head/sys/dev/drm2/i915
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Oct 2015 07:43:03 -0000

Author: dumbbell
Date: Sat Oct 10 07:43:02 2015
New Revision: 289109
URL: https://svnweb.freebsd.org/changeset/base/289109

Log:
  drm/i915: Remove "Attempting to unbind pinned buffer" message
  
  This error message is removed in later versions of Linux and currently,
  it spams users.
  
  PR:		200712
  MFC after:	1 week

Modified:
  head/sys/dev/drm2/i915/i915_gem.c

Modified: head/sys/dev/drm2/i915/i915_gem.c
==============================================================================
--- head/sys/dev/drm2/i915/i915_gem.c	Sat Oct 10 06:43:44 2015	(r289108)
+++ head/sys/dev/drm2/i915/i915_gem.c	Sat Oct 10 07:43:02 2015	(r289109)
@@ -2527,10 +2527,8 @@ i915_gem_object_unbind(struct drm_i915_g
 	if (obj->gtt_space == NULL)
 		return 0;
 
-	if (obj->pin_count) {
-		DRM_ERROR("Attempting to unbind pinned buffer\n");
+	if (obj->pin_count)
 		return -EINVAL;
-	}
 
 	ret = i915_gem_object_finish_gpu(obj);
 	if (ret == -ERESTARTSYS || ret == -EINTR)